Merge remote-tracking branch 'upstream/main'

elastic · Jul 23, 2024 · ca145eb · ca145eb
2 parents e2734ae + d7a21a7
commit ca145eb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/grafana/provisioning/dashboards/demo/demo-dashboard.json b/src/grafana/provisioning/dashboards/demo/demo-dashboard.json
@@ -24,6 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "id": 2,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -52,6 +53,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -107,6 +109,7 @@
         "y": 1
       },
       "id": 2,
+      "interval": "2m",
       "options": {
         "legend": {
           "calcs": [],
@@ -187,6 +190,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -241,6 +245,7 @@
         "y": 1
       },
       "id": 10,
+      "interval": "2m",
       "options": {
         "legend": {
           "calcs": [],
@@ -281,6 +286,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -336,10 +342,11 @@
         "y": 9
       },
       "id": 12,
+      "interval": "2m",
       "options": {
         "legend": {
           "calcs": [],
-          "displayMode": "list",
+          "displayMode": "table",
           "placement": "bottom",
           "showLegend": true
         },
@@ -431,7 +438,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "10.1.2",
+      "pluginVersion": "10.4.3",
       "targets": [
         {
           "alias": "",
@@ -518,7 +525,7 @@
         },
         "showHeader": true
       },
-      "pluginVersion": "10.1.2",
+      "pluginVersion": "10.4.3",
       "targets": [
         {
           "alias": "",
@@ -577,6 +584,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -695,6 +703,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -798,6 +807,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -892,6 +902,7 @@
             "mode": "palette-classic"
           },
           "custom": {
+            "axisBorderShow": false,
             "axisCenteredZero": false,
             "axisColorMode": "text",
             "axisLabel": "",
@@ -946,6 +957,7 @@
         "y": 35
       },
       "id": 16,
+      "interval": "2m",
       "options": {
         "legend": {
           "calcs": [],
@@ -965,7 +977,7 @@
             "uid": "webstore-metrics"
           },
           "editorMode": "code",
-          "expr": "rate(otel_trace_span_processor_spans{job=\"opentelemetry-demo/quoteservice\"}[2m])*120",
+          "expr": "rate(otel_trace_span_processor_spans{job=\"quoteservice\"}[2m])*120",
           "interval": "2m",
           "legendFormat": "{{state}}",
           "range": true,
@@ -978,17 +990,16 @@
   ],
   "refresh": "",
   "revision": 1,
-  "schemaVersion": 38,
-  "style": "dark",
+  "schemaVersion": 39,
   "tags": [],
   "templating": {
     "list": [
       {
         "allValue": "",
         "current": {
           "selected": true,
-          "text": "adservice",
-          "value": "adservice"
+          "text": "frontend",
+          "value": "frontend"
         },
         "datasource": {
           "type": "prometheus",
@@ -1013,7 +1024,7 @@
     ]
   },
   "time": {
-    "from": "now-3h",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {},
@@ -1022,4 +1033,4 @@
   "uid": "W2gX2zHVk",
   "version": 1,
   "weekStart": ""
-}
+}
diff --git a/src/prometheus/prometheus-config.yaml b/src/prometheus/prometheus-config.yaml
@@ -4,6 +4,9 @@
 global:
   evaluation_interval: 30s
   scrape_interval: 5s
+storage:
+  tsdb:
+    out_of_order_time_window: 30m
 scrape_configs:
 - job_name: otel-collector
   static_configs: