Skip to content

Commit c934952

Browse files
MasterPtatoNathanFlurry
authored andcommitted
fix: fix all dashboards
1 parent f41d8a5 commit c934952

File tree

57 files changed

+5140
-5300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+5140
-5300
lines changed

engine/docker/dev-host/grafana/dashboards/api.json

Lines changed: 96 additions & 116 deletions
Large diffs are not rendered by default.

engine/docker/dev-host/grafana/dashboards/cache.json

Lines changed: 272 additions & 371 deletions
Large diffs are not rendered by default.

engine/docker/dev-host/grafana/dashboards/futures.json

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"editable": true,
1919
"fiscalYearStartMonth": 0,
2020
"graphTooltip": 0,
21+
"id": 3,
2122
"links": [],
2223
"panels": [
2324
{
@@ -100,8 +101,11 @@
100101
"editorMode": "code",
101102
"editorType": "sql",
102103
"format": 1,
104+
"meta": {},
105+
"pluginVersion": "4.11.2",
106+
"queryType": "table",
103107
"range": true,
104-
"rawSql": "WITH\n $__timeInterval(TimeUnix) as time_bucket,\n arrayJoin(arrayEnumerate(BucketCounts)) AS idx,\n ExplicitBounds AS bounds\nSELECT\n time_bucket as Time,\n bounds[idx+1] AS le,\n sum(BucketCounts[idx]) AS count\nFROM otel.otel_metrics_histogram\nWHERE\n MetricName = 'rivet_instrumented_future_duration'\n AND $__conditionalAll(Attributes['name'], $name)\n AND $__conditionalAll(Attributes['location'], $location)\n AND $__timeFilter(TimeUnix)\nGROUP BY Time, le\nORDER BY Time, le",
108+
"rawSql": "WITH\n 30 as collector_rate_s\n\nSELECT Time, bucket, count\nFROM (\n SELECT\n Time,\n bucket,\n greatest(0, count - lagInFrame(count, 1, 0) OVER (PARTITION BY bucket ORDER BY Time)) AS count\n FROM (\n WITH\n $__timeInterval(TimeUnix) as time_bucket,\n arrayJoin(arrayEnumerate(BucketCounts)) AS idx,\n case when idx = length(BucketCounts) then inf else ExplicitBounds[idx] end as bucket\n SELECT\n time_bucket as Time,\n bucket,\n sum(BucketCounts[idx]) AS count\n FROM otel.otel_metrics_histogram\n WHERE\n MetricName = 'rivet_instrumented_future_duration'\n -- AND ResourceAttributes['rivet.project'] IN array($project)\n -- AND ResourceAttributes['rivet.datacenter'] IN array($datacenter)\n AND Attributes['name'] IN array($name)\n AND Attributes['location'] IN array($location)\n AND TimeUnix >= $__fromTime_ms() - toIntervalMillisecond(greatest(collector_rate_s * 1000, $__interval_s * 1000))\n AND TimeUnix <= $__toTime_ms()\n AND AggregationTemporality = 2\n GROUP BY Time, bucket\n )\n)\nWHERE $__timeFilter(Time)",
105109
"refId": "A"
106110
}
107111
],
@@ -110,7 +114,7 @@
110114
{
111115
"id": "groupingToMatrix",
112116
"options": {
113-
"columnField": "le",
117+
"columnField": "bucket",
114118
"emptyValue": "zero",
115119
"rowField": "Time",
116120
"valueField": "count"
@@ -122,7 +126,7 @@
122126
"conversions": [
123127
{
124128
"destinationType": "time",
125-
"targetField": "Time\\le"
129+
"targetField": "Time\\bucket"
126130
}
127131
],
128132
"fields": {}
@@ -138,6 +142,39 @@
138142
"tags": [],
139143
"templating": {
140144
"list": [
145+
{
146+
"current": {
147+
"text": ["All"],
148+
"value": ["$__all"]
149+
},
150+
"definition": "SELECT DISTINCT ResourceAttributes['rivet.project'] FROM otel.otel_metrics_gauge WHERE ServiceName = 'rivet' ORDER BY ResourceAttributes['rivet.project']",
151+
"description": "",
152+
"includeAll": true,
153+
"label": "project",
154+
"multi": true,
155+
"name": "project",
156+
"options": [],
157+
"query": "SELECT DISTINCT ResourceAttributes['rivet.project'] FROM otel.otel_metrics_gauge WHERE ServiceName = 'rivet' ORDER BY ResourceAttributes['rivet.project']",
158+
"refresh": 1,
159+
"regex": "",
160+
"type": "query"
161+
},
162+
{
163+
"current": {
164+
"text": "All",
165+
"value": "$__all"
166+
},
167+
"definition": "SELECT DISTINCT ResourceAttributes['rivet.datacenter'] FROM otel.otel_metrics_gauge WHERE ServiceName = 'rivet' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY ResourceAttributes['rivet.datacenter']",
168+
"includeAll": true,
169+
"label": "datacenter",
170+
"multi": true,
171+
"name": "datacenter",
172+
"options": [],
173+
"query": "SELECT DISTINCT ResourceAttributes['rivet.datacenter'] FROM otel.otel_metrics_gauge WHERE ServiceName = 'rivet' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY ResourceAttributes['rivet.datacenter']",
174+
"refresh": 1,
175+
"regex": "",
176+
"type": "query"
177+
},
141178
{
142179
"current": {
143180
"text": ["All"],
@@ -147,17 +184,13 @@
147184
"type": "grafana-clickhouse-datasource",
148185
"uid": "clickhouse"
149186
},
150-
"definition": "SELECT DISTINCT Attributes['name'] as name FROM otel.otel_metrics_histogram WHERE MetricName = 'rivet_instrumented_future_duration' ORDER BY name",
187+
"definition": "SELECT DISTINCT Attributes['name'] FROM otel.otel_metrics_histogram WHERE ServiceName = 'rivet' AND MetricName = 'rivet_instrumented_future_duration' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY Attributes['name']",
151188
"includeAll": true,
152-
"label": "Name",
189+
"label": "name",
153190
"multi": true,
154191
"name": "name",
155192
"options": [],
156-
"query": {
157-
"qryType": 1,
158-
"rawSql": "SELECT DISTINCT Attributes['name'] as name FROM otel.otel_metrics_histogram WHERE MetricName = 'rivet_instrumented_future_duration' ORDER BY name",
159-
"refId": "ClickHouseVariableQueryEditor-VariableQuery"
160-
},
193+
"query": "SELECT DISTINCT Attributes['name'] FROM otel.otel_metrics_histogram WHERE ServiceName = 'rivet' AND MetricName = 'rivet_instrumented_future_duration' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY Attributes['name']",
161194
"refresh": 1,
162195
"regex": "",
163196
"type": "query"
@@ -171,32 +204,16 @@
171204
"type": "grafana-clickhouse-datasource",
172205
"uid": "clickhouse"
173206
},
174-
"definition": "SELECT DISTINCT Attributes['location'] as location FROM otel.otel_metrics_histogram WHERE MetricName = 'rivet_instrumented_future_duration' ORDER BY location",
207+
"definition": "SELECT DISTINCT Attributes['location'] FROM otel.otel_metrics_histogram WHERE ServiceName = 'rivet' AND MetricName = 'rivet_instrumented_future_duration' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY Attributes['location']",
175208
"includeAll": true,
176-
"label": "Location",
209+
"label": "location",
177210
"multi": true,
178211
"name": "location",
179212
"options": [],
180-
"query": {
181-
"qryType": 1,
182-
"rawSql": "SELECT DISTINCT Attributes['location'] as location FROM otel.otel_metrics_histogram WHERE MetricName = 'rivet_instrumented_future_duration' ORDER BY location",
183-
"refId": "ClickHouseVariableQueryEditor-VariableQuery"
184-
},
213+
"query": "SELECT DISTINCT Attributes['location'] FROM otel.otel_metrics_histogram WHERE ServiceName = 'rivet' AND MetricName = 'rivet_instrumented_future_duration' AND ResourceAttributes['rivet.project'] IN array($project) ORDER BY Attributes['location']",
185214
"refresh": 1,
186215
"regex": "",
187216
"type": "query"
188-
},
189-
{
190-
"current": {
191-
"text": "30",
192-
"value": "30"
193-
},
194-
"hide": 2,
195-
"label": "Metric Export Interval (seconds)",
196-
"name": "metric_interval",
197-
"query": "30",
198-
"skipUrlSync": true,
199-
"type": "constant"
200217
}
201218
]
202219
},
@@ -207,6 +224,7 @@
207224
"timepicker": {},
208225
"timezone": "browser",
209226
"title": "Futures",
210-
"version": 0,
227+
"uid": "ef353ektqu4g0e",
228+
"version": 1,
211229
"weekStart": ""
212230
}

0 commit comments

Comments
 (0)