inspectIT · Patrick-Eichhorn · Aug 27, 2021 · Aug 24, 2021 · Aug 26, 2021 · Aug 27, 2021
diff --git a/inspectit-ocelot-demo/docker-compose-influxdb-jaeger.yml b/inspectit-ocelot-demo/docker-compose-influxdb-jaeger.yml
@@ -218,11 +218,13 @@ services:
     image: grafana/grafana:8.0.6
     container_name: grafana
     environment:
+      - GF_PANELS_DISABLE_SANITIZE_HTML=TRUE
       - GF_SECURITY_ADMIN_PASSWORD=demo
       - GF_PATHS_PROVISIONING=/usr/share/grafana/custom/
       - GF_INSTALL_PLUGINS=https://github.com/NovatecConsulting/novatec-service-dependency-graph-panel/releases/download/v4.0.2/novatec-sdg-panel.zip;novatec-sdg-panel
     volumes:
       - ./grafana/provisioning/influxdb:/usr/share/grafana/custom/
+      - ./grafana/provisioning/home-dashboard/home.json:/usr/share/grafana/public/dashboards/home.json
     ports:
       - 3001:3000
 

diff --git a/inspectit-ocelot-demo/docker-compose-influxdb-zipkin.yml b/inspectit-ocelot-demo/docker-compose-influxdb-zipkin.yml
@@ -218,11 +218,13 @@ services:
     image: grafana/grafana:8.0.6
     container_name: grafana
     environment:
+      - GF_PANELS_DISABLE_SANITIZE_HTML=TRUE
       - GF_SECURITY_ADMIN_PASSWORD=demo
       - GF_PATHS_PROVISIONING=/usr/share/grafana/custom/
       - GF_INSTALL_PLUGINS=https://github.com/NovatecConsulting/novatec-service-dependency-graph-panel/releases/download/v4.0.2/novatec-sdg-panel.zip;novatec-sdg-panel
     volumes:
       - ./grafana/provisioning/influxdb:/usr/share/grafana/custom/
+      - ./grafana/provisioning/home-dashboard/home.json:/usr/share/grafana/public/dashboards/home.json
     ports:
       - 3001:3000
 

diff --git a/inspectit-ocelot-demo/docker-compose-prometheus-jaeger.yml b/inspectit-ocelot-demo/docker-compose-prometheus-jaeger.yml
@@ -210,11 +210,14 @@ services:
     image: grafana/grafana:8.0.6
     container_name: grafana
     environment:
+      - GF_PANELS_DISABLE_SANITIZE_HTML=TRUE
       - GF_SECURITY_ADMIN_PASSWORD=demo
       - GF_PATHS_PROVISIONING=/usr/share/grafana/custom/
       - GF_INSTALL_PLUGINS=https://github.com/NovatecConsulting/novatec-service-dependency-graph-panel/releases/download/v4.0.2/novatec-sdg-panel.zip;novatec-sdg-panel
     volumes:
       - ./grafana/provisioning/prometheus:/usr/share/grafana/custom/
+      - ./grafana/provisioning/home-dashboard/home.json:/usr/share/grafana/public/dashboards/home.json
+
     ports:
       - 3001:3000
 

diff --git a/inspectit-ocelot-demo/grafana/provisioning/home-dashboard/home.json b/inspectit-ocelot-demo/grafana/provisioning/home-dashboard/home.json
@@ -0,0 +1,137 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 5,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 123126,
+      "options": {
+        "content": "<body>\r\n\t<div style=\"display: flex; flex-direction: row; align-items: center; background-image: url('https://inspectit.rocks/static/hero.svg'), linear-gradient(155deg,#101010 50%,#6d3a00)\">\r\n\t\t<img style=\"margin: 15px;\" src=\"https://inspectit.rocks/static/ocelot_logo.svg\">\r\n\t\t<h1 style=\"flex-grow: 1;\">Welcome to InspectIT Ocelot</h1>\r\n\t\t<h3 style=\"margin-right: 15px; color: white\">Need Help?</h3>\r\n\t\t<a style=\"color:white; margin-right: 15px;\"href=\"https://inspectit.github.io/inspectit-ocelot/docs/doc1\">Ocelot Documentation</a>\r\n\t\t<a style=\"color: white; margin-right: 15px;\"href=\"https://openapm.io/\">Open APM Landscape</a>\r\n\t\t<a style=\"color: white; margin-right: 15px;\"href=\"mailto:Alexander.Haferland@novatec-gmbh.de\" target=\"_blank\">Contact us</a>\r\n\t</div>\r\n</body>\t",
+        "mode": "html"
+      },
+      "pluginVersion": "8.0.6",
+      "targets": [
+        {
+          "queryType": "randomWalk",
+          "refId": "A"
+        }
+      ],
+      "transparent": true,
+      "type": "text"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 5
+      },
+      "id": 123124,
+      "links": [],
+      "options": {
+        "folderId": 6,
+        "maxItems": 30,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": []
+      },
+      "pluginVersion": "8.0.6",
+      "tags": [],
+      "title": "Agent",
+      "type": "dashlist"
+    },
+    {
+      "datasource": null,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 5
+      },
+      "id": 3,
+      "links": [],
+      "options": {
+        "folderId": 0,
+        "maxItems": 30,
+        "query": "",
+        "showHeadings": false,
+        "showRecentlyViewed": false,
+        "showSearch": true,
+        "showStarred": false,
+        "tags": []
+      },
+      "pluginVersion": "8.0.6",
+      "tags": [],
+      "title": "EUM",
+      "type": "dashlist"
+    }
+  ],
+  "refresh": false,
+  "schemaVersion": 30,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "2021-08-24T06:47:32.708Z",
+    "to": "2021-08-24T18:47:32.708Z"
+  },
+  "timepicker": {
+    "hidden": true,
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ],
+    "type": "timepicker"
+  },
+  "timezone": "browser",
+  "title": "Home",
+  "uid": null,
+  "version": 0
+}
diff --git a/...db/dashboards/http-overview-influxql.json → ...hboards/agent/http-overview-influxql.json b/...db/dashboards/http-overview-influxql.json → ...hboards/agent/http-overview-influxql.json
diff --git a/...ning/influxdb/dashboards/jvm-metrics.json → ...nfluxdb/dashboards/agent/jvm-metrics.json b/...ning/influxdb/dashboards/jvm-metrics.json → ...nfluxdb/dashboards/agent/jvm-metrics.json
diff --git a/.../influxdb/dashboards/self-monitoring.json → ...xdb/dashboards/agent/self-monitoring.json b/.../influxdb/dashboards/self-monitoring.json → ...xdb/dashboards/agent/self-monitoring.json
diff --git a/...db/dashboards/service-graph-influxql.json → ...hboards/agent/service-graph-influxql.json b/...db/dashboards/service-graph-influxql.json → ...hboards/agent/service-graph-influxql.json
@@ -16,8 +16,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 3,
-  "iteration": 1628674705667,
+  "iteration": 1629379201350,
   "links": [],
   "panels": [
     {
@@ -387,7 +386,9 @@
   "refresh": "30s",
   "schemaVersion": 30,
   "style": "dark",
-  "tags": [],
+  "tags": [
+    "agent"
+  ],
   "templating": {
     "list": [
       {

diff --git a/...g/influxdb/dashboards/system-metrics.json → ...uxdb/dashboards/agent/system-metrics.json b/...g/influxdb/dashboards/system-metrics.json → ...uxdb/dashboards/agent/system-metrics.json
diff --git a/inspectit-ocelot-demo/grafana/provisioning/influxdb/dashboards/dashboards.yml b/inspectit-ocelot-demo/grafana/provisioning/influxdb/dashboards/dashboards.yml
@@ -8,4 +8,12 @@ providers:
   disableDeletion: false
   updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
   options:
-    path: /usr/share/grafana/custom/dashboards/
+    path: /usr/share/grafana/custom/dashboards/
+- name: 'agent'
+  orgId: 1
+  folder: 'agent'
+  type: file
+  disableDeletion: false
+  updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
+  options:
+    path: /usr/share/grafana/custom/dashboards/agent
diff --git a/.../prometheus/dashboards/http-overview.json → ...theus/dashboards/agent/http-overview.json b/.../prometheus/dashboards/http-overview.json → ...theus/dashboards/agent/http-overview.json
diff --git a/...ng/prometheus/dashboards/jvm-metrics.json → ...metheus/dashboards/agent/jvm-metrics.json b/...ng/prometheus/dashboards/jvm-metrics.json → ...metheus/dashboards/agent/jvm-metrics.json
diff --git a/...rometheus/dashboards/self-monitoring.json → ...eus/dashboards/agent/self-monitoring.json b/...rometheus/dashboards/self-monitoring.json → ...eus/dashboards/agent/self-monitoring.json
diff --git a/.../prometheus/dashboards/service-graph.json → ...theus/dashboards/agent/service-graph.json b/.../prometheus/dashboards/service-graph.json → ...theus/dashboards/agent/service-graph.json
diff --git a/...prometheus/dashboards/system-metrics.json → ...heus/dashboards/agent/system-metrics.json b/...prometheus/dashboards/system-metrics.json → ...heus/dashboards/agent/system-metrics.json
diff --git a/inspectit-ocelot-demo/grafana/provisioning/prometheus/dashboards/dashboards.yml b/inspectit-ocelot-demo/grafana/provisioning/prometheus/dashboards/dashboards.yml
@@ -8,4 +8,12 @@ providers:
   disableDeletion: false
   updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
   options:
-    path: /usr/share/grafana/custom/dashboards
+    path: /usr/share/grafana/custom/dashboards
+- name: 'agent'
+  orgId: 1
+  folder: 'agent'
+  type: file
+  disableDeletion: false
+  updateIntervalSeconds: 10 #how often Grafana will scan for changed dashboards
+  options:
+    path: /usr/share/grafana/custom/dashboards/agent