fixing vshn_pg and redis

vshn · Dec 17, 2024 · a427b6e · a427b6e
1 parent 7ad19a8
commit a427b6e
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 894 deletions.
diff --git a/component/vshn_postgres.jsonnet b/component/vshn_postgres.jsonnet
@@ -315,7 +315,7 @@ 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 {
++ if vars.isSingleOrServiceCluster && inv.parameters.facts.cloud != 'exoscale' 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'),

diff --git a/component/vshn_redis.jsonnet b/component/vshn_redis.jsonnet
@@ -572,7 +572,7 @@ local plansCM = kube.ConfigMap('vshnredisplans') + {
    '21_composition_vshn_redis': composition,
    [if isOpenshift then '21_openshift_template_redis_vshn']: osTemplate,
  } else {})
-+ if vars.isSingleOrServiceCluster then {
++ if vars.isSingleOrServiceCluster && inv.parameters.facts.cloud != 'exoscale' 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'),

diff --git a/tests/golden/vshn-cloud/appcat/appcat/22_prom_rule_sla_postgres.yaml b/tests/golden/vshn-cloud/appcat/appcat/22_prom_rule_sla_postgres.yaml
diff --git a/tests/golden/vshn-cloud/appcat/appcat/22_prom_rule_sla_redis.yaml b/tests/golden/vshn-cloud/appcat/appcat/22_prom_rule_sla_redis.yaml
diff --git a/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/70_slo_vshn_postgresql.yaml b/tests/golden/vshn-cloud/appcat/appcat/sli_exporter/70_slo_vshn_postgresql.yaml