matrix-rtc: fix services monitors#569
Conversation
dyff of changes in rendered templates of CI manifestsmatrix-rtc-checkov-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
matrix-rtc-exposed-services-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
matrix-rtc-external-livekit-secrets-externally-values.yaml@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
matrix-rtc-external-livekit-secrets-in-helm-values.yaml@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
matrix-rtc-host-mode-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
matrix-rtc-minimal-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
matrix-rtc-secrets-externally-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
matrix-rtc-secrets-in-helm-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
pytest-matrix-rtc-standalone-values.yaml@@ metadata @@
# apps/v1/Deployment/ess-ci/release-name-matrix-rtc-authorisation-service
! + one map entry added:
+ annotations:
+ has-no-service-monitor: "true"
@@ spec.template.metadata @@
# apps/v1/Deployment/ess-ci/release-name-matrix-rtc-authorisation-service
! + one map entry added:
+ annotations:
+ has-no-service-monitor: "true"
@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
pytest-matrix-rtc-synapse-wellknown-values.yaml@@ metadata @@
# apps/v1/Deployment/ess-ci/release-name-matrix-rtc-authorisation-service
! + one map entry added:
+ annotations:
+ has-no-service-monitor: "true"
@@ spec.template.metadata @@
# apps/v1/Deployment/ess-ci/release-name-matrix-rtc-authorisation-service
! + one map entry added:
+ annotations:
+ has-no-service-monitor: "true"
@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-certificates-pg-external-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-certificates-pg-with-helm-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-external-cert-pg-external-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-external-cert-pg-with-helm-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-letsencrypt-pg-external-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-letsencrypt-pg-with-helm-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-wildcard-cert-pg-external-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
quick-setup-wildcard-cert-pg-with-helm-values.yaml@@ spec.ports @@
# v1/Service/ess-ci/release-name-matrix-rtc-sfu
! + one list entry added:
+ - name: metrics
+ port: 6789
+ targetPort: metrics
@@ servicemonitor-release-name-matrix-rtc-authorisation-service.yaml @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-authorisation-service
! - one file removed
- apiVersion: monitoring.coreos.com/v1
- kind: ServiceMonitor
- metadata:
- labels:
- helm.sh/chart: "matrix-stack-25.6.3-dev"
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/part-of: matrix-stack
- app.kubernetes.io/component: matrix-rtc-authorisation-service
- app.kubernetes.io/name: matrix-rtc-authorisation-service
- app.kubernetes.io/instance: release-name-matrix-rtc-authorisation-service
- app.kubernetes.io/version: "0.2.3"
- name: release-name-matrix-rtc-authorisation-service
- namespace: ess-ci
@@ spec.endpoints.0.port @@
# monitoring.coreos.com/v1/ServiceMonitor/ess-ci/release-name-matrix-rtc-sfu
! ± value change
- http
+ metrics
|
66ca7d4 to
4dd40dc
Compare
benbz
left a comment
There was a problem hiding this comment.
This all looks plausible but there's no automated way of knowing whether this is correct.
How tricky would it be to have an integration test that looks at all ServiceMonitors, looks at all matching Services, poke /metrics on all Endpoints on said Services and assert all have successful responses with Prometheus/OpenTelemetry looking responses
The difficult part is that we have to do some |
Makes sense. Or |
104869b to
c9aff39
Compare
b69c358 to
84b1088
Compare
84b1088 to
4694f5d
Compare
c93b5c0 to
4ab25b2
Compare
c0f9a9f to
ca62c63
Compare
In the room, it was raised that matrix-rtc services monitors were wrong : https://matrix.to/#/!RkXKfjpGXIVObpCqOI:element.io/$DM2GN8exEvvq69WPVVVBMJf-1G_E0_35G7pSB0nkhCw?via=matrix.org&via=element.io&via=k8ekat.dev