From a29343671db49690c65fd1dd4dc861bc1b6de0e8 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 12 Mar 2024 15:35:21 +0100 Subject: [PATCH] Add default dashboard (grafana) --- docker-compose.yml | 6 +- grafana/dashboard/dashboard.json | 171 +++++++++++++++++++++++++++++++ grafana/dashboard/dashboard.yaml | 12 +++ grafana/datasource.yml | 3 +- spring-app/DockerCommands.txt | 7 -- spring-app/mvnw | 0 6 files changed, 190 insertions(+), 9 deletions(-) create mode 100644 grafana/dashboard/dashboard.json create mode 100644 grafana/dashboard/dashboard.yaml delete mode 100644 spring-app/DockerCommands.txt mode change 100644 => 100755 spring-app/mvnw diff --git a/docker-compose.yml b/docker-compose.yml index 367f40b..9d6a880 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: volumes: - ./prometheus:/etc/prometheus - prom_data:/prometheus + grafana: image: grafana/grafana container_name: grafana @@ -30,6 +31,9 @@ services: - GF_SECURITY_ADMIN_USER=admin - GF_SECURITY_ADMIN_PASSWORD=grafana volumes: - - ./grafana:/etc/grafana/provisioning/datasources + - ./grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml + - ./grafana/dashboard/dashboard.json:/var/lib/grafana/dashboards/dashboard.json + - ./grafana/dashboard/dashboard.yaml:/etc/grafana/provisioning/dashboards/main.yaml + volumes: prom_data: diff --git a/grafana/dashboard/dashboard.json b/grafana/dashboard/dashboard.json new file mode 100644 index 0000000..01b41e3 --- /dev/null +++ b/grafana/dashboard/dashboard.json @@ -0,0 +1,171 @@ +{ + "__inputs": [ + { + "name": "DS_PROMETHEUS", + "label": "Prometheus", + "description": "", + "type": "datasource", + "pluginId": "prometheus", + "pluginName": "Prometheus" + } + ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "10.4.0" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "timeseries", + "name": "Time series", + "version": "" + } + ], + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "links": [], + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 10, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 1, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "prometheus" + }, + "disableTextWrap": false, + "editorMode": "builder", + "expr": "calls_count", + "fullMetaSearch": false, + "includeNullMetadata": true, + "instant": false, + "legendFormat": "__auto", + "range": true, + "refId": "A", + "useBackend": false + } + ], + "title": "Panel Title", + "type": "timeseries" + } + ], + "refresh": "5s", + "schemaVersion": 39, + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-5m", + "to": "now" + }, + "timepicker": {}, + "timezone": "browser", + "title": "calls-count-dashboard", + "uid": "fdffzblo2ob28c", + "version": 3, + "weekStart": "" +} \ No newline at end of file diff --git a/grafana/dashboard/dashboard.yaml b/grafana/dashboard/dashboard.yaml new file mode 100644 index 0000000..fd66a47 --- /dev/null +++ b/grafana/dashboard/dashboard.yaml @@ -0,0 +1,12 @@ +apiVersion: 1 + +providers: + - name: "Dashboard provider" + orgId: 1 + type: file + disableDeletion: false + updateIntervalSeconds: 10 + allowUiUpdates: false + options: + path: /var/lib/grafana/dashboards + foldersFromFilesStructure: true diff --git a/grafana/datasource.yml b/grafana/datasource.yml index 4431f20..67bd167 100644 --- a/grafana/datasource.yml +++ b/grafana/datasource.yml @@ -6,4 +6,5 @@ datasources: url: http://prometheus:9090 isDefault: true access: proxy - editable: true \ No newline at end of file + editable: true + uid: prometheus \ No newline at end of file diff --git a/spring-app/DockerCommands.txt b/spring-app/DockerCommands.txt deleted file mode 100644 index ab8f324..0000000 --- a/spring-app/DockerCommands.txt +++ /dev/null @@ -1,7 +0,0 @@ -# create image for REST API -docker build . -t springbootapi - -# run rest API -docker run -p 8081:8080 --name springbootapiinstance springbootapi - -# the api is reachable under http://localhost:8081/data \ No newline at end of file diff --git a/spring-app/mvnw b/spring-app/mvnw old mode 100644 new mode 100755