diff --git a/services/monitoring/grafana-folders.yaml b/services/monitoring/grafana-folders.yaml index 35ab954..54b278f 100644 --- a/services/monitoring/grafana-folders.yaml +++ b/services/monitoring/grafana-folders.yaml @@ -33,10 +33,3 @@ data: permission: View - role: Admin permission: Admin - - uid: atlas-testing - title: Atlas Testing - permissions: - - role: Editor - permission: View - - role: Admin - permission: Admin diff --git a/services/monitoring/helmrelease.yaml b/services/monitoring/helmrelease.yaml index ae74b3e..304de05 100644 --- a/services/monitoring/helmrelease.yaml +++ b/services/monitoring/helmrelease.yaml @@ -25,6 +25,8 @@ spec: values: - titan-22 prometheusScrape: false + metricLabelsAllowlist: + - cronjobs=[atlas.bstein.dev/glue] --- @@ -298,15 +300,34 @@ spec: enabled: true size: 20Gi storageClassName: astreae + nodeSelector: + kubernetes.io/arch: arm64 + node-role.kubernetes.io/worker: "true" affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: kubernetes.io/hostname - operator: NotIn + - key: hardware + operator: In values: - - titan-22 + - rpi5 + - rpi4 + preferredDuringSchedulingIgnoredDuringExecution: + - weight: 100 + preference: + matchExpressions: + - key: hardware + operator: In + values: + - rpi5 + - weight: 70 + preference: + matchExpressions: + - key: hardware + operator: In + values: + - rpi4 deploymentStrategy: type: Recreate service: @@ -450,7 +471,7 @@ spec: path: /var/lib/grafana/dashboards/mail - name: testing orgId: 1 - folder: Atlas Testing + folder: Atlas Internal type: file disableDeletion: false editable: true