diff --git a/k8s/monitoring/templates/session-telemetry-dashboard.yaml b/k8s/monitoring/templates/session-telemetry-dashboard.yaml index 9a0e695..84c48d2 100644 --- a/k8s/monitoring/templates/session-telemetry-dashboard.yaml +++ b/k8s/monitoring/templates/session-telemetry-dashboard.yaml @@ -57,7 +57,7 @@ data: "pluginVersion": "8.0.0", "targets": [ { - "expr": "sum(increase(session_peer_telemetry_total{video_seen=\"true\"}[$__range])) / sum(increase(session_peer_telemetry_total[$__range])) * 100", + "expr": "sum(increase(session_peer_telemetry_total{video_seen="true", classifier=~"$classifier"}[$__range])) / sum(increase(session_peer_telemetry_total{classifier=~"$classifier"}[$__range])) * 100", "refId": "A" } ], @@ -103,7 +103,7 @@ data: "pluginVersion": "8.0.0", "targets": [ { - "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" [$__range]))", + "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" [$__range]))", "refId": "A" } ], @@ -149,7 +149,7 @@ data: "pluginVersion": "8.0.0", "targets": [ { - "expr": "count(sum by (room) (count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" | logfmt [$__range])))", + "expr": "count(sum by (room) (count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt [$__range])))", "refId": "A" } ], @@ -219,7 +219,7 @@ data: }, "targets": [ { - "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" [$__interval]))", + "expr": "sum(count_over_time({namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" [$__interval]))", "legendFormat": "Joins", "refId": "A" } @@ -254,7 +254,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_peer_telemetry_total[$__range])) by (p2p)", + "expr": "sum(increase(session_peer_telemetry_total{classifier=~"$classifier"}[$__range])) by (p2p)", "legendFormat": "P2P: {{ "{{" }}p2p{{ "}}" }}", "refId": "A" } @@ -289,7 +289,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_peer_telemetry_total[$__range])) by (relay)", + "expr": "sum(increase(session_peer_telemetry_total{classifier=~"$classifier"}[$__range])) by (relay)", "legendFormat": "Relay: {{ "{{" }}relay{{ "}}" }}", "refId": "A" } @@ -324,7 +324,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_peer_telemetry_total[$__range])) by (protocol)", + "expr": "sum(increase(session_peer_telemetry_total{classifier=~"$classifier"}[$__range])) by (protocol)", "legendFormat": "{{ "{{" }}protocol{{ "}}" }}", "refId": "A" } @@ -359,7 +359,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_summary_telemetry_total{type=\"join\"}[$__range])) by (how_many_seen)", + "expr": "sum(increase(session_summary_telemetry_total{type=\"join\", classifier=~\"$classifier\"}[$__range])) by (how_many_seen)", "legendFormat": "{{ "{{" }}how_many_seen{{ "}}" }}", "refId": "A" } @@ -394,7 +394,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_summary_telemetry_total{type=\"leave\"}[$__range])) by (how_many_seen)", + "expr": "sum(increase(session_summary_telemetry_total{type=\"leave\", classifier=~\"$classifier\"}[$__range])) by (how_many_seen)", "legendFormat": "{{ "{{" }}how_many_seen{{ "}}" }}", "refId": "A" } @@ -428,7 +428,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_join_telemetry_others_bucket[$__range])) by (le)", + "expr": "sum(increase(session_join_telemetry_others_bucket{classifier=~\"$classifier\"}[$__range])) by (le)", "format": "heatmap", "refId": "A" } @@ -462,7 +462,7 @@ data: }, "targets": [ { - "expr": "sum(increase(session_join_telemetry_age_bucket[$__range])) by (le)", + "expr": "sum(increase(session_join_telemetry_age_bucket{classifier=~\"$classifier\"}[$__range])) by (le)", "format": "heatmap", "refId": "A" } @@ -501,7 +501,7 @@ data: }, "targets": [ { - "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" | logfmt", + "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt", "maxLines": 500, "refId": "A" } @@ -605,7 +605,7 @@ data: }, "targets": [ { - "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" | logfmt", + "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt", "maxLines": 500, "refId": "A" } @@ -685,7 +685,7 @@ data: }, "targets": [ { - "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_summary_telemetry\" | logfmt", + "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=join_summary_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt", "maxLines": 500, "refId": "A" } @@ -764,7 +764,7 @@ data: }, "targets": [ { - "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=leave_summary_telemetry\" | logfmt", + "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=leave_summary_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" | logfmt", "maxLines": 500, "refId": "A" } @@ -843,7 +843,7 @@ data: }, "targets": [ { - "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |= \"protocol=unknown\" | logfmt", + "expr": "{namespace=\"webrtc-be\", container=\"webrtc-be\"} |= \"type=peer_telemetry\" |~ \"classifier=\\\"($classifier)\\\"\" |= \"protocol=unknown\" | logfmt", "maxLines": 500, "refId": "A" } @@ -941,6 +941,45 @@ data: "regex": "", "skipUrlSync": false, "type": "datasource" + }, + { + "allValue": ".*", + "current": { + "selected": false, + "text": "All", + "value": "$__all" + }, + "hide": 0, + "includeAll": true, + "label": "Traffic Type", + "multi": true, + "name": "classifier", + "options": [ + { + "selected": true, + "text": "All", + "value": "$__all" + }, + { + "selected": false, + "text": "Real", + "value": "Real" + }, + { + "selected": false, + "text": "Test", + "value": "Test" + }, + { + "selected": false, + "text": "Probe", + "value": "Probe" + } + ], + "query": "Real, Test, Probe", + "queryValue": "", + "skipUrlSync": false, + "type": "custom" } ] }, diff --git a/k8s/webrtc-be/values-production.yaml b/k8s/webrtc-be/values-production.yaml index 1f2bfd4..65ee0d3 100644 --- a/k8s/webrtc-be/values-production.yaml +++ b/k8s/webrtc-be/values-production.yaml @@ -6,7 +6,7 @@ grafana: backendUrl: "https://www.jamkazam.com" auth: true # Webrtc_be image version -webrtc_tag: 1.0.162 +webrtc_tag: 1.0.163 unused_tag: 1.0.0 enableDieEndpoint: false mediasoup: diff --git a/k8s/webrtc-be/values-staging.yaml b/k8s/webrtc-be/values-staging.yaml index 7cf9a0f..235540a 100644 --- a/k8s/webrtc-be/values-staging.yaml +++ b/k8s/webrtc-be/values-staging.yaml @@ -5,7 +5,7 @@ grafana: # Webrtc env variables backendUrl: "https://staging.jamkazam.com" # Webrtc_be image version -webrtc_tag: 1.0.162 +webrtc_tag: 1.0.163 unused_tag: 1.0.0 enableDieEndpoint: true mediasoup: