fixed Dashboard not found when trying to open Grafana link from Jenki…

…ns job
serputko · Sep 19, 2018 · e380cb5 · e380cb5
1 parent 90f7a61
commit e380cb5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/docker-compose-with-frontend.yml b/docker-compose-with-frontend.yml
@@ -7,7 +7,7 @@ services:
      links:
        - influxdb:influxdb
        - graphite
-     image: grafana
+     image: grafana/grafana
      build: ./grafana
      user: "104"
      ports:
@@ -85,7 +85,7 @@ services:
       privileged: true
       restart: always
    jenkins:
-      image: jenkins
+      image: jenkins/jenkins
       build: ./jenkins
       depends_on:
        - docker-dind
@@ -156,7 +156,7 @@ services:
    jmeter:
      container_name: jmeter
      build: ./jmeter
-     image: jmeter
+     image: "java:8-jdk"
      entrypoint:
        - cat
    influxdb-timeshift-proxy:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
      container_name: grafana
      links:
        - influxdb:influxdb
-     image: grafana
+     image: grafana/grafana
      build: ./grafana
      user: "104"
      ports:
@@ -52,7 +52,7 @@ services:
       privileged: true
       restart: always
    jenkins:
-      image: jenkins
+      image: jenkins/jenkins
       build: ./jenkins
       depends_on:
        - docker-dind
@@ -92,7 +92,7 @@ services:
    jmeter:
      container_name: jmeter
      build: ./jmeter
-     image: jmeter
+     image: "java:8-jdk"
      entrypoint:
        - cat
    influxdb-timeshift-proxy:

diff --git a/jenkins/jobs/BackendJob.xml b/jenkins/jobs/BackendJob.xml
@@ -138,7 +138,7 @@ grafana_url = &quot;127.0.0.1:8857&quot;
 }
 
 // grafana url for aggregate dashboard - replace time stamp with %s
-def perfResult = &quot;http://%s/dashboard/db/load-test-monitoring-with-docker-containers-monitoring?from=%s&amp;to=%s&quot;
+def perfResult = &quot;http://%s/dashboard/db/load-test-monitoring?from=%s&amp;to=%s&quot;
 
 // get build start and end time
 def start = build.getStartTimeInMillis();