Skip to content

Commit

Permalink
Merge pull request #853 from rancher/dashboard-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@kralicky
kralicky authored Dec 15, 2022
2 parents ad889bc + 4e7bfe5 commit a8902c7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
26 changes: 14 additions & 12 deletions pkg/resources/monitoring/dashboards/home.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 1,
"id": 23,
"id": null,
"links": [],
"liveNow": false,
"panels": [
Expand Down Expand Up @@ -388,7 +388,7 @@
}
]
},
"pluginVersion": "9.2.4",
"pluginVersion": "9.2.6",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -713,6 +713,7 @@
}
]
},
"min": 0,
"unit": "percentunit"
},
"overrides": []
Expand Down Expand Up @@ -749,7 +750,7 @@
"uid": "P0BEE70D62F42845E"
},
"editorMode": "code",
"expr": "cluster:node_cpu:ratio * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "cluster:node_cpu:ratio * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"format": "time_series",
"interval": "1m",
"legendFormat": "{{friendly_name}}",
Expand Down Expand Up @@ -862,7 +863,7 @@
"uid": "P0BEE70D62F42845E"
},
"editorMode": "code",
"expr": "sum by(__tenant_id__) (irate(container_network_receive_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "sum by(__tenant_id__) (irate(container_network_receive_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"interval": "1m",
"legendFormat": "[Rx] {{friendly_name}}",
"range": true,
Expand All @@ -874,7 +875,7 @@
"uid": "P0BEE70D62F42845E"
},
"editorMode": "code",
"expr": "sum by(__tenant_id__) (-irate(container_network_transmit_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "sum by(__tenant_id__) (-irate(container_network_transmit_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"hide": false,
"interval": "1m",
"legendFormat": "[Tx] {{friendly_name}}",
Expand Down Expand Up @@ -1017,6 +1018,7 @@
}
]
},
"min": 0,
"unit": "percentunit"
},
"overrides": []
Expand Down Expand Up @@ -1047,7 +1049,7 @@
"uid": "P0BEE70D62F42845E"
},
"editorMode": "code",
"expr": "1 - (:node_memory_MemAvailable_bytes:sum / on(__tenant_id__) sum by(__tenant_id__) (node_memory_MemTotal_bytes)) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "1 - (:node_memory_MemAvailable_bytes:sum / on(__tenant_id__) sum by(__tenant_id__) (node_memory_MemTotal_bytes)) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"format": "time_series",
"interval": "1m",
"legendFormat": "{{friendly_name}}",
Expand Down Expand Up @@ -1156,10 +1158,10 @@
"uid": "$datasource"
},
"editorMode": "code",
"expr": "sum(rate(kubelet_runtime_operations_errors_total{job=\"kubelet\",}[$__rate_interval])) by (__tenant_id__, operation_type) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "sum(rate(kubelet_runtime_operations_errors_total{job=\"kubelet\",}[$__rate_interval])) by (__tenant_id__, operation_type, node) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"format": "time_series",
"intervalFactor": 4,
"legendFormat": "{{friendly_name}}",
"legendFormat": "{{friendly_name}} / {{node}}",
"range": true,
"refId": "A"
}
Expand Down Expand Up @@ -1274,7 +1276,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "opni_agent_status_summary * on(cluster_id, instance) group_right(summary) (group without(pod) (opni_cluster_info))",
"expr": "opni_agent_status_summary * on(cluster_id, instance) group_right(summary) (group without(pod) (opni_cluster_info @ end()))",
"format": "table",
"instant": false,
"legendFormat": "__auto",
Expand Down Expand Up @@ -1391,7 +1393,7 @@
"uid": "P0BEE70D62F42845E"
},
"editorMode": "code",
"expr": "sum by (__tenant_id__) (rate(node_disk_read_bytes_total[$__rate_interval])+rate(node_disk_written_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"expr": "sum by (__tenant_id__) (rate(node_disk_read_bytes_total[$__rate_interval])+rate(node_disk_written_bytes_total[$__rate_interval])) * on(__tenant_id__) group_left(friendly_name) label_replace(group without(pod, instance) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end()), \"__tenant_id__\", \"$1\", \"cluster_id\", \"(.*)\")",
"format": "time_series",
"interval": "1m",
"legendFormat": "{{friendly_name}}",
Expand Down Expand Up @@ -1494,7 +1496,7 @@
},
"editorMode": "code",
"exemplar": false,
"expr": "label_replace(sum by(user) (cortex_bucket_blocks_count), \"cluster_id\", \"$1\", \"user\", \"(.*)\") * on(cluster_id) group_left(friendly_name) opni_cluster_info",
"expr": "label_replace(sum by(user) (cortex_bucket_blocks_count), \"cluster_id\", \"$1\", \"user\", \"(.*)\") * on(cluster_id) group_left(friendly_name) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end())",
"format": "time_series",
"instant": false,
"legendFormat": "{{friendly_name}}",
Expand Down Expand Up @@ -1545,6 +1547,6 @@
"timezone": "",
"title": "Infrastructure Overview",
"uid": "1e83e204be502391f69d3a826675d3df",
"version": 7,
"version": 8,
"weekStart": ""
}
4 changes: 2 additions & 2 deletions pkg/resources/monitoring/dashboards/opni-gateway.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"uid": "P0BEE70D62F42845E"
},
"exemplar": false,
"expr": "sum by(cluster_id) (rate(opni_gateway_remote_write_cluster_ingest_bytes[5m])) * on(cluster_id) group_left(friendly_name) opni_cluster_info",
"expr": "sum by(cluster_id) (rate(opni_gateway_remote_write_cluster_ingest_bytes[5m])) * on(cluster_id) group_left(friendly_name) (opni_cluster_info @ end() or opni_monitoring_cluster_info @ end())",
"instant": false,
"interval": "",
"legendFormat": "{{friendly_name}}",
Expand Down Expand Up @@ -769,6 +769,6 @@
"timezone": "",
"title": "Opni Gateway",
"uid": "DKa1Akynk",
"version": 2,
"version": 3,
"weekStart": ""
}
2 changes: 1 addition & 1 deletion pkg/test/environment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func (e *Environment) Start(opts ...EnvironmentOption) error {
enableGateway: true,
enableCortex: true,
enableDisconnectServer: true,
enableRealtimeServer: true,
enableRealtimeServer: false,
agentIdSeed: time.Now().UnixNano(),
defaultAgentVersion: defaultAgentVersion(),
storageBackend: defaultStorageBackend(),
Expand Down

0 comments on commit a8902c7

Please sign in to comment.