Merge pull request #95 from davidffrench/INTLY-2352

Intly 2352
integr8ly · Aug 23, 2019 · 1e51216 · 1e51216
2 parents a063264 + c149a7d
commit 1e51216
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ CONSUMER_NAMESPACES=${NAMESPACE}
 PROJECT=keycloak-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG=v1.8.2
+TAG=v1.8.3
 PKG=github.com/integr8ly/keycloak-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=keycloak-operator-test

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: keycloak-operator
-          image: quay.io/integreatly/keycloak-operator:v1.8.2
+          image: quay.io/integreatly/keycloak-operator:v1.8.3
           ports:
           - containerPort: 60000
             name: metrics

diff --git a/deploy/template/prometheus-rule.yaml b/deploy/template/prometheus-rule.yaml
@@ -80,3 +80,51 @@ spec:
           for: 5m
           labels:
             severity: warning
+        - alert: KeycloakInstanceNotAvailable
+          annotations:
+            message: >-
+              Keycloak instance in namespace {{ $labels.namespace }} has not
+              been available for the last 5 minutes.
+          expr: >
+            (1 - absent(kube_pod_status_ready{namespace="sso", condition="true"}
+            * on (pod) group_left (label_deploymentConfig)
+            kube_pod_labels{label_deploymentConfig="sso"})) == 0 or
+            probe_success{service="rhsso-ui"} == 0 
+          for: 5m
+          labels:
+            severity: critical
+        - alert: KeycloakAPIRequestDuration90PercThresholdExceeded
+          annotations:
+            message: >-
+              Less than 90% of the RH SSO API endpoints in namespace {{ $labels.namespace }} are taking longer than 1s for the last 5 minutes.
+          expr: >
+            (sum(rate(keycloak_request_duration_bucket{le="1000.0"}[5m])) by (job) 
+            /
+            sum(rate(keycloak_request_duration_count[5m])) by (job)) < 0.90
+          for: 5m
+          labels:
+            severity: critical
+        - alert: KeycloakAPIRequestDuration99PercThresholdExceeded
+          annotations:
+            message: >-
+              Less than 99.5% of the RH SSO API endpoints in namespace {{ $labels.namespace }} are taking longer than 10s for the last 5 minutes.
+          expr: >
+            (sum(rate(keycloak_request_duration_bucket{le="10000.0"}[5m])) by (job) 
+            /
+            sum(rate(keycloak_request_duration_count[5m])) by (job)) < 0.995
+          for: 5m
+          labels:
+            severity: critical
+        - alert: KeycloakDatabaseNotAvailable
+          annotations:
+            message: >-
+              RH SSO database in namespace {{ $labels.namespace }} is not
+              available for the last 5 minutes.
+          expr: >
+            (1 - absent(kube_pod_status_ready{namespace="sso", condition="true"}
+            * on (pod) group_left (label_deploymentConfig)
+            kube_pod_labels{label_deploymentConfig="sso-postgresql"})) == 0 
+          for: 5m
+          labels:
+            severity: critical
+
diff --git a/deploy/test-pod.yaml b/deploy/test-pod.yaml
@@ -6,7 +6,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: keycloak-operator-test
-    image: quay.io/integreatly/keycloak-operator:v1.8.2
+    image: quay.io/integreatly/keycloak-operator:v1.8.3
     imagePullPolicy: Always
     command: ["/go-test.sh"]
     env:

diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "1.8.2"
+	Version = "1.8.3"
 )