Update spring dash scripts

ExpressScripts · Jun 14, 2018 · 3a18727 · 3a18727
1 parent 2110313
commit 3a18727
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 135 deletions.
diff --git a/samples/micrometer-samples-boot1/src/main/resources/application-prometheus.yml b/samples/micrometer-samples-boot1/src/main/resources/application-prometheus.yml
@@ -15,5 +15,5 @@
 #
 
 management.security.enabled: false
-
-management.metrics.export.prometheus.enabled: true
+management.metrics.export.prometheus.enabled: true
+management.metrics.distribution.percentiles-histogram.http: true
diff --git a/scripts/spring-dash/grafana-dashboard.yml b/scripts/spring-dash/grafana-dashboard.yml
@@ -2,7 +2,7 @@ apiVersion: 1
 
 providers:
 - name: 'default'
-  folder: ''
+  folder: 'Spring Boot'
   type: file
   options:
     path: /etc/grafana/dashboards

diff --git a/scripts/spring-dash/grafana.sh b/scripts/spring-dash/grafana.sh
@@ -5,4 +5,5 @@ docker run -i -p 3000:3000 \
 -v $(pwd)/jvmgc-dashboard.json:/etc/grafana/dashboards/jvmgc.json \
 -v $(pwd)/latency-dashboard.json:/etc/grafana/dashboards/latency.json \
 -v $(pwd)/processor-dashboard.json:/etc/grafana/dashboards/processor.json \
-grafana/grafana:5.0.1
+grafana/grafana:5.1.0
+
diff --git a/scripts/spring-dash/jvmgc-dashboard.json b/scripts/spring-dash/jvmgc-dashboard.json
@@ -1,34 +1,4 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "5.1.0"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
-      "version": "5.0.0"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "5.0.0"
-    }
-  ],
   "annotations": {
     "list": [
       {
@@ -46,15 +16,15 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": null,
+  "id": 2,
   "links": [],
   "panels": [
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -176,7 +146,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "description": "Triggers when heap usage after major GC is over chosen threshold. If this gets too high it can lead to excessive stop the world pauses.",
       "fill": 0,
       "gridPos": {
@@ -223,20 +193,23 @@
       "steppedLine": true,
       "targets": [
         {
+          "$$hashKey": "object:571",
           "expr": "jvm_gc_live_data_size_bytes",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Size of Old Gen after last GC",
           "refId": "A"
         },
         {
+          "$$hashKey": "object:572",
           "expr": "jvm_gc_max_data_size_bytes",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Max size of Old Gen pool",
           "refId": "B"
         },
         {
+          "$$hashKey": "object:573",
           "expr": "jvm_gc_live_data_size_bytes/jvm_gc_max_data_size_bytes",
           "format": "time_series",
           "intervalFactor": 1,
@@ -298,7 +271,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -389,7 +362,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -473,7 +446,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -557,7 +530,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -643,7 +616,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -745,6 +718,7 @@
       }
     }
   ],
+  "refresh": "10s",
   "schemaVersion": 16,
   "style": "dark",
   "tags": [],
@@ -783,5 +757,5 @@
   "timezone": "",
   "title": "JVM GC",
   "uid": "kuhTd-Imz",
-  "version": 9
+  "version": 1
 }
diff --git a/scripts/spring-dash/latency-dashboard.json b/scripts/spring-dash/latency-dashboard.json
@@ -1,43 +1,8 @@
 {
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "5.1.0"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
-      "version": "5.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "heatmap",
-      "name": "Heatmap",
-      "version": "5.0.0"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "5.0.0"
-    }
-  ],
   "annotations": {
     "list": [
       {
+        "$$hashKey": "object:857",
         "builtIn": 1,
         "datasource": "-- Grafana --",
         "enable": true,
@@ -51,16 +16,16 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": null,
-  "iteration": 1528496572444,
+  "id": 4,
+  "iteration": 1528999680036,
   "links": [],
   "panels": [
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -179,7 +144,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -295,15 +260,15 @@
         "cardRound": null
       },
       "color": {
-        "cardColor": "#cffaff",
+        "cardColor": "#33ff00",
         "colorScale": "sqrt",
         "colorScheme": "interpolateSpectral",
         "exponent": 0.3,
         "min": null,
-        "mode": "spectrum"
+        "mode": "opacity"
       },
       "dataFormat": "tsbuckets",
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "gridPos": {
         "h": 9,
         "w": 12,
@@ -319,7 +284,7 @@
       "links": [],
       "targets": [
         {
-          "expr": "sum(rate(http_server_requests_seconds_bucket{le=~\"0\\\\.[0-1]\\\\d+\"}[1m])) by (le)",
+          "expr": "sum(rate(http_server_requests_seconds_bucket{le=~\"0\\\\.[0-4]\\\\d+|\\\\+Inf\"}[1m])) by (le)",
           "format": "heatmap",
           "instant": false,
           "interval": "",
@@ -357,7 +322,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
+      "datasource": "prometheus",
       "fill": 0,
       "gridPos": {
         "h": 9,
@@ -445,8 +410,11 @@
     "list": [
       {
         "allValue": null,
-        "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Application",
@@ -465,8 +433,11 @@
       },
       {
         "allValue": null,
-        "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Cluster",
@@ -485,8 +456,11 @@
       },
       {
         "allValue": null,
-        "current": {},
-        "datasource": "${DS_PROMETHEUS}",
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "prometheus",
         "hide": 0,
         "includeAll": true,
         "label": "Instance",
@@ -537,5 +511,5 @@
   "timezone": "",
   "title": "Latency",
   "uid": "UfvgtJSmk",
-  "version": 19
+  "version": 2
 }