Merge pull request #603 from vshn/fix-new-prom

Disable prometheus rules if slos is disabled

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'), {})

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 {}

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 {}