diff --git a/component/vshn_appcat_services.jsonnet b/component/vshn_appcat_services.jsonnet index 99bbf037e..637b37a33 100644 --- a/component/vshn_appcat_services.jsonnet +++ b/component/vshn_appcat_services.jsonnet @@ -192,12 +192,13 @@ local vshn_appcat_service(name, serviceParams) = [if isOpenshift && std.objectHas(serviceParams, 'openshiftTemplate') then '21_openshift_template_%s_vshn' % name]: osTemplate, } else {}) - + if vars.isSingleOrServiceCluster then { - ['22_prom_rule_sla_%s' % name]: promRuleSLA, - [if params.services.vshn.enabled && serviceParams.enabled then 'sli_exporter/70_slo_vshn_%s' % name]: slos.Get('vshn-' + name), - [if params.services.vshn.enabled && serviceParams.enabled then 'sli_exporter/80_slo_vshn_%s_ha' % name]: slos.Get('vshn-' + name + '-ha'), - [if params.slos.alertsEnabled then 'sli_exporter/90_%s_Opsgenie' % xrd.spec.claimNames.kind]: opsgenieRules.GenGenericAlertingRule(xrd.spec.claimNames.kind), - } else {} -; + + if vars.isSingleOrServiceCluster then + if params.services.vshn.enabled && serviceParams.enabled then { + ['22_prom_rule_sla_%s' % name]: promRuleSLA, + ['sli_exporter/70_slo_vshn_%s' % name]: slos.Get('vshn-' + name), + ['sli_exporter/80_slo_vshn_%s_ha' % name]: slos.Get('vshn-' + name + '-ha'), + [if params.slos.alertsEnabled then 'sli_exporter/90_%s_Opsgenie' % xrd.spec.claimNames.kind]: opsgenieRules.GenGenericAlertingRule(xrd.spec.claimNames.kind), + } else {} + else {}; std.foldl(function(objOut, newObj) objOut + vshn_appcat_service(newObj.name, newObj.value), common.FilterServiceByBoolean('compFunctionsOnly'), {}) diff --git a/component/vshn_postgres.jsonnet b/component/vshn_postgres.jsonnet index 4ba065580..c0598722a 100644 --- a/component/vshn_postgres.jsonnet +++ b/component/vshn_postgres.jsonnet @@ -315,10 +315,11 @@ local plansCM = kube.ConfigMap('vshnpostgresqlplans') + { [if isOpenshift then '11_stackgres_openshift_operator']: std.prune(stackgresOperator), [if isOpenshift then '12_stackgres_openshift_operator_netpol']: stackgresNetworkPolicy, } else {}) -+ if vars.isSingleOrServiceCluster then { - '22_prom_rule_sla_postgres': promRulePostgresSLA, - [if params.slos.enabled && params.services.vshn.enabled && params.services.vshn.postgres.enabled then 'sli_exporter/70_slo_vshn_postgresql']: slos.Get('vshn-postgresql'), - [if params.slos.enabled && params.services.vshn.enabled && params.services.vshn.postgres.enabled then 'sli_exporter/80_slo_vshn_postgresql_ha']: slos.Get('vshn-postgresql-ha'), - [if params.services.vshn.enabled && params.services.vshn.postgres.enabled && params.slos.alertsEnabled then 'sli_exporter/90_VSHNPostgreSQL_Opsgenie']: opsgenieRules.GenGenericAlertingRule('VSHNPostgreSQL'), - -} else {} ++ if vars.isSingleOrServiceCluster then + if params.slos.enabled && params.services.vshn.enabled && params.services.vshn.postgres.enabled then { + '22_prom_rule_sla_postgres': promRulePostgresSLA, + 'sli_exporter/70_slo_vshn_postgresql': slos.Get('vshn-postgresql'), + 'sli_exporter/80_slo_vshn_postgresql_ha': slos.Get('vshn-postgresql-ha'), + [if params.slos.alertsEnabled then 'sli_exporter/90_VSHNPostgreSQL_Opsgenie']: opsgenieRules.GenGenericAlertingRule('VSHNPostgreSQL'), + } else {} +else {} diff --git a/component/vshn_redis.jsonnet b/component/vshn_redis.jsonnet index 0b6c322c8..32486c72e 100644 --- a/component/vshn_redis.jsonnet +++ b/component/vshn_redis.jsonnet @@ -572,9 +572,11 @@ local plansCM = kube.ConfigMap('vshnredisplans') + { '21_composition_vshn_redis': composition, [if isOpenshift then '21_openshift_template_redis_vshn']: osTemplate, } else {}) -+ if vars.isSingleOrServiceCluster then { - '22_prom_rule_sla_redis': promRuleRedisSLA, - [if params.services.vshn.enabled && params.services.vshn.redis.enabled then 'sli_exporter/70_slo_vshn_redis']: slos.Get('vshn-redis'), - [if params.services.vshn.enabled && params.services.vshn.redis.enabled then 'sli_exporter/80_slo_vshn_redis_ha']: slos.Get('vshn-redis-ha'), - [if params.services.vshn.enabled && params.services.vshn.redis.enabled && params.slos.alertsEnabled then 'sli_exporter/90_VSHNRedis_Opsgenie']: opsgenieRules.GenGenericAlertingRule('VSHNRedis'), -} else {} ++ if vars.isSingleOrServiceCluster then + if params.services.vshn.enabled && params.services.vshn.redis.enabled then { + '22_prom_rule_sla_redis': promRuleRedisSLA, + 'sli_exporter/70_slo_vshn_redis': slos.Get('vshn-redis'), + 'sli_exporter/80_slo_vshn_redis_ha': slos.Get('vshn-redis-ha'), + [if params.slos.alertsEnabled then 'sli_exporter/90_VSHNRedis_Opsgenie']: opsgenieRules.GenGenericAlertingRule('VSHNRedis'), + } else {} +else {} diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_keycloak.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_keycloak.yaml deleted file mode 100644 index 8323216e4..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_keycloak.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnkeycloak-sla - name: vshn-vshnkeycloak-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnkeycloak-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNKeycloak - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_mariadb.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_mariadb.yaml deleted file mode 100644 index d33d0c560..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_mariadb.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnmariadb-sla - name: vshn-vshnmariadb-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnmariadb-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMariaDB - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_minio.yaml deleted file mode 100644 index 4b50512ce..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_minio.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnminio-sla - name: vshn-vshnminio-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMinio - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_nextcloud.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_nextcloud.yaml deleted file mode 100644 index 8f0ec5bdf..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_nextcloud.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnnextcloud-sla - name: vshn-vshnnextcloud-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnnextcloud-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNNextcloud - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_postgres.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_postgres.yaml deleted file mode 100644 index 67e403989..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_postgres.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnpostgresql-sla - name: vshn-vshnpostgresql-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnpostgresql-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNPostgreSQL - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_redis.yaml b/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_redis.yaml deleted file mode 100644 index a083d5e88..000000000 --- a/tests/golden/defaults/appcat/appcat/22_prom_rule_sla_redis.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnredis-sla - name: vshn-vshnredis-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnredis-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNRedis - record: sla:objective:ratio diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNKeycloak_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNKeycloak_Opsgenie.yaml deleted file mode 100644 index 0994963a2..000000000 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNKeycloak_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnkeycloak-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnkeycloak-sla-target - rules: - - alert: vshn-vshnkeycloak-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNKeycloak", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNKeycloak", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNKeycloak - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnkeycloak-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNKeycloak", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNKeycloak", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNKeycloak - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMariaDB_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMariaDB_Opsgenie.yaml deleted file mode 100644 index 2e827669a..000000000 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMariaDB_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnmariadb-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnmariadb-sla-target - rules: - - alert: vshn-vshnmariadb-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMariaDB", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMariaDB", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMariaDB - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnmariadb-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMariaDB", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMariaDB", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMariaDB - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml deleted file mode 100644 index 6452e0fee..000000000 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnminio-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - alert: vshn-vshnminio-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnminio-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar diff --git a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNNextcloud_Opsgenie.yaml b/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNNextcloud_Opsgenie.yaml deleted file mode 100644 index f3bbb5301..000000000 --- a/tests/golden/defaults/appcat/appcat/sli_exporter/90_VSHNNextcloud_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnnextcloud-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnnextcloud-sla-target - rules: - - alert: vshn-vshnnextcloud-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNNextcloud", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNNextcloud", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNNextcloud - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnnextcloud-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNNextcloud", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNNextcloud", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNNextcloud - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar diff --git a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/dev/appcat/appcat/22_prom_rule_sla_minio.yaml deleted file mode 100644 index 4b50512ce..000000000 --- a/tests/golden/dev/appcat/appcat/22_prom_rule_sla_minio.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnminio-sla - name: vshn-vshnminio-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMinio - record: sla:objective:ratio diff --git a/tests/golden/dev/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml b/tests/golden/dev/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml deleted file mode 100644 index 6452e0fee..000000000 --- a/tests/golden/dev/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnminio-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - alert: vshn-vshnminio-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnminio-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_keycloak.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_keycloak.yaml deleted file mode 100644 index 8323216e4..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_keycloak.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnkeycloak-sla - name: vshn-vshnkeycloak-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnkeycloak-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNKeycloak - record: sla:objective:ratio diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_mariadb.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_mariadb.yaml deleted file mode 100644 index d33d0c560..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_mariadb.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnmariadb-sla - name: vshn-vshnmariadb-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnmariadb-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMariaDB - record: sla:objective:ratio diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_minio.yaml deleted file mode 100644 index 4b50512ce..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_minio.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnminio-sla - name: vshn-vshnminio-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMinio - record: sla:objective:ratio diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_nextcloud.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_nextcloud.yaml deleted file mode 100644 index 8f0ec5bdf..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_nextcloud.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnnextcloud-sla - name: vshn-vshnnextcloud-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnnextcloud-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNNextcloud - record: sla:objective:ratio diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_postgres.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_postgres.yaml deleted file mode 100644 index 67e403989..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_postgres.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnpostgresql-sla - name: vshn-vshnpostgresql-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnpostgresql-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNPostgreSQL - record: sla:objective:ratio diff --git a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_redis.yaml b/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_redis.yaml deleted file mode 100644 index a083d5e88..000000000 --- a/tests/golden/exodev/appcat/appcat/22_prom_rule_sla_redis.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnredis-sla - name: vshn-vshnredis-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnredis-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNRedis - record: sla:objective:ratio diff --git a/tests/golden/service-cluster/appcat/appcat/22_prom_rule_sla_minio.yaml b/tests/golden/service-cluster/appcat/appcat/22_prom_rule_sla_minio.yaml deleted file mode 100644 index 4b50512ce..000000000 --- a/tests/golden/service-cluster/appcat/appcat/22_prom_rule_sla_minio.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - name: vshn-vshnminio-sla - name: vshn-vshnminio-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - expr: vector(99.25) - labels: - service: VSHNMinio - record: sla:objective:ratio diff --git a/tests/golden/service-cluster/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml b/tests/golden/service-cluster/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml deleted file mode 100644 index 6452e0fee..000000000 --- a/tests/golden/service-cluster/appcat/appcat/sli_exporter/90_VSHNMinio_Opsgenie.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - syn: 'true' - syn_component: appcat - syn_team: schedar - name: vshn-vshnminio-new-sla - namespace: syn-appcat-slos -spec: - groups: - - name: appcat-vshnminio-sla-target - rules: - - alert: vshn-vshnminio-new-sla - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="false", maintenance="false"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="false", maintenance="false"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar - - alert: vshn-vshnminio-new-sla-ha - annotations: - summary: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - title: '{{$labels.service}} {{$labels.name}} down in {{$labels.namespace}}' - expr: rate(appcat_probes_seconds_count{reason!="success", service="VSHNMinio", - ha="true"}[5m]) > 0.2 and rate(appcat_probes_seconds_count{reason!="success", - service="VSHNMinio", ha="true"}[1m]) > 0.75 - labels: - OnCall: '{{ if eq $labels.sla "guaranteed" }}true{{ else }}false{{ end - }}' - runbook: https://kb.vshn.ch/app-catalog/how-tos/appcat/GuaranteedUptimeTarget.html - service: VSHNMinio - severity: critical - syn: 'true' - syn_component: appcat - syn_team: schedar