update dashboard to use rate (#99)

Signed-off-by: Mark Nelson <[email protected]>
oracle · Jun 12, 2024 · 045ae01 · 045ae01
1 parent e7c8c3c
commit 045ae01
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 73 deletions.
diff --git a/docker-compose/compose.yaml b/docker-compose/compose.yaml
@@ -48,10 +48,9 @@ services:
     ports:
       - 9161:9161
     environment:
-      - DB_USERNAME=sys
+      - DB_USERNAME=system
       - DB_PASSWORD=Welcome12345
       - DB_CONNECT_STRING=free23c:1521/free
-      - DB_ROLE=SYSDBA
       - CUSTOM_METRICS=/exporter/txeventq-metrics.toml
     volumes:
       - ./exporter:/exporter

diff --git a/docker-compose/grafana/dashboards/oracle_rev2.json b/docker-compose/grafana/dashboards/oracle_rev2.json
@@ -863,43 +863,42 @@
         "datasource": {
           "type": "prometheus"
         },
-        "description": "",
         "fieldConfig": {
           "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
             "custom": {
-              "axisCenteredZero": false,
-              "axisColorMode": "text",
-              "axisLabel": "",
-              "axisPlacement": "auto",
-              "barAlignment": 0,
               "drawStyle": "line",
+              "lineInterpolation": "linear",
+              "barAlignment": 0,
+              "lineWidth": 1,
               "fillOpacity": 72,
               "gradientMode": "none",
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              },
+              "spanNulls": true,
               "insertNulls": false,
-              "lineInterpolation": "linear",
-              "lineWidth": 1,
+              "showPoints": "auto",
               "pointSize": 5,
+              "stacking": {
+                "mode": "normal",
+                "group": "A"
+              },
+              "axisPlacement": "auto",
+              "axisLabel": "",
+              "axisColorMode": "text",
               "scaleDistribution": {
                 "type": "linear"
               },
-              "showPoints": "auto",
-              "spanNulls": true,
-              "stacking": {
-                "group": "A",
-                "mode": "normal"
+              "axisCenteredZero": false,
+              "hideFrom": {
+                "tooltip": false,
+                "viz": false,
+                "legend": false
               },
               "thresholdsStyle": {
                 "mode": "off"
               }
             },
+            "color": {
+              "mode": "palette-classic"
+            },
             "mappings": [],
             "thresholds": {
               "mode": "absolute",
@@ -926,15 +925,15 @@
         },
         "id": 21,
         "options": {
-          "legend": {
-            "calcs": [],
-            "displayMode": "list",
-            "placement": "bottom",
-            "showLegend": true
-          },
           "tooltip": {
             "mode": "single",
             "sort": "none"
+          },
+          "legend": {
+            "showLegend": true,
+            "displayMode": "list",
+            "placement": "bottom",
+            "calcs": []
           }
         },
         "targets": [
@@ -944,176 +943,187 @@
             },
             "disableTextWrap": false,
             "editorMode": "code",
-            "expr": "oracledb_wait_time_administrative",
+            "expr": "rate(oracledb_wait_time_administrative[$__rate_interval])",
             "format": "time_series",
             "fullMetaSearch": false,
             "includeNullMetadata": true,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Administrative",
             "range": true,
             "refId": "A",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_application",
+            "expr": "rate(oracledb_wait_time_application[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Application",
             "range": true,
             "refId": "B",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_cluster",
+            "expr": "rate(oracledb_wait_time_cluster[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Cluster",
             "range": true,
             "refId": "C",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_commit",
+            "expr": "rate(oracledb_wait_time_commit[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Commit",
             "range": true,
             "refId": "D",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_concurrency",
+            "expr": "rate(oracledb_wait_time_concurrency[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Concurrency",
             "range": true,
             "refId": "E",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_configuration",
+            "expr": "rate(oracledb_wait_time_configuration[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Configuration",
             "range": true,
             "refId": "F",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_network",
+            "expr": "rate(oracledb_wait_time_network[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Network",
             "range": true,
             "refId": "G",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_other",
+            "expr": "rate(oracledb_wait_time_other[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Other",
             "range": true,
             "refId": "H",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_scheduler",
+            "expr": "rate(oracledb_wait_time_scheduler[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "Scheduler",
             "range": true,
             "refId": "I",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_user_io",
+            "expr": "rate(oracledb_wait_time_user_io[$__rate_interval])",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "User I/O",
             "range": true,
             "refId": "J",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           },
           {
             "datasource": {
               "type": "prometheus"
             },
             "disableTextWrap": false,
             "editorMode": "builder",
-            "expr": "oracledb_wait_time_system_io",
+            "expr": "rate(oracledb_wait_time_system_io[$__rate_interval])",
             "format": "time_series",
             "fullMetaSearch": false,
             "hide": false,
-            "includeNullMetadata": true,
+            "includeNullMetadata": false,
             "instant": false,
-            "legendFormat": "{{__name__}}",
+            "legendFormat": "System I/O",
             "range": true,
             "refId": "K",
-            "useBackend": false
+            "useBackend": false,
+            "exemplar": false
           }
         ],
         "title": "Database Wait Times",
@@ -1126,7 +1136,8 @@
             }
           }
         ],
-        "type": "timeseries"
+        "type": "timeseries",
+        "description": ""
       },
       {
         "collapsed": false,