New probe handlers (#100)

Signed-off-by: Igor Shishkin <me@teran.dev>
teran · Aug 5, 2024 · c3ce077 · c3ce077
1 parent 4f57fda
commit c3ce077
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 9 deletions.
diff --git a/cmd/exporter/main.go b/cmd/exporter/main.go
@@ -64,6 +64,36 @@ func main() {
 
 	g.Go(func() error {
 		http.Handle("/metrics", promhttp.Handler())
+
+		http.HandleFunc("/healthz/startup", func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte("ok\n"))
+		})
+
+		http.HandleFunc("/healthz/readiness", func(w http.ResponseWriter, r *http.Request) {
+			log.Warnf("db.Ping() error on readiness probe: %s", err)
+
+			if err := db.Ping(); err != nil {
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
+		http.HandleFunc("/healthz/liveness", func(w http.ResponseWriter, r *http.Request) {
+			if err := db.Ping(); err != nil {
+				log.Warnf("db.Ping() error on liveness probe: %s", err)
+
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
 		return http.ListenAndServe(cfg.Addr, nil)
 	})
 

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -128,6 +128,36 @@ func main() {
 
 	g.Go(func() error {
 		http.Handle("/metrics", promhttp.Handler())
+
+		http.HandleFunc("/healthz/startup", func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte("ok\n"))
+		})
+
+		http.HandleFunc("/healthz/readiness", func(w http.ResponseWriter, r *http.Request) {
+			log.Warnf("db.Ping() error on readiness probe: %s", err)
+
+			if err := db.Ping(); err != nil {
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
+		http.HandleFunc("/healthz/liveness", func(w http.ResponseWriter, r *http.Request) {
+			if err := db.Ping(); err != nil {
+				log.Warnf("db.Ping() error on liveness probe: %s", err)
+
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
 		return http.ListenAndServe(cfg.MetricsAddr, nil)
 	})
 

diff --git a/cmd/publisher/main.go b/cmd/publisher/main.go
@@ -112,6 +112,36 @@ func main() {
 
 	g.Go(func() error {
 		http.Handle("/metrics", promhttp.Handler())
+
+		http.HandleFunc("/healthz/startup", func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte("ok\n"))
+		})
+
+		http.HandleFunc("/healthz/readiness", func(w http.ResponseWriter, r *http.Request) {
+			log.Warnf("db.Ping() error on readiness probe: %s", err)
+
+			if err := db.Ping(); err != nil {
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
+		http.HandleFunc("/healthz/liveness", func(w http.ResponseWriter, r *http.Request) {
+			if err := db.Ping(); err != nil {
+				log.Warnf("db.Ping() error on liveness probe: %s", err)
+
+				w.WriteHeader(http.StatusServiceUnavailable)
+				w.Write([]byte("failed\n"))
+			} else {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte("ok\n"))
+			}
+		})
+
 		return http.ListenAndServe(cfg.MetricsAddr, nil)
 	})
 

diff --git a/docs/examples/deploy/k8s/archived-exporter.yaml b/docs/examples/deploy/k8s/archived-exporter.yaml
@@ -55,15 +55,21 @@ spec:
               memory: 128Mi
             limits:
               memory: 1Gi
-          readinessProbe:
+          startupProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/startup
               port: metrics
             timeoutSeconds: 1
+          readinessProbe:
+            httpGet:
+              path: /healthz/readiness
+              port: metrics
+            timeoutSeconds: 5
           livenessProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/liveness
               port: metrics
+            timeoutSeconds: 5
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/docs/examples/deploy/k8s/archived-manager.yaml b/docs/examples/deploy/k8s/archived-manager.yaml
@@ -63,15 +63,21 @@ spec:
               memory: 1Gi
             limits:
               memory: 1Gi
-          readinessProbe:
+          startupProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/startup
               port: metrics
             timeoutSeconds: 1
+          readinessProbe:
+            httpGet:
+              path: /healthz/readiness
+              port: metrics
+            timeoutSeconds: 5
           livenessProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/liveness
               port: metrics
+            timeoutSeconds: 5
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
diff --git a/docs/examples/deploy/k8s/archived-publisher.yaml b/docs/examples/deploy/k8s/archived-publisher.yaml
@@ -63,15 +63,21 @@ spec:
               memory: 128Mi
             limits:
               memory: 1Gi
-          readinessProbe:
+          startupProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/startup
               port: metrics
             timeoutSeconds: 1
+          readinessProbe:
+            httpGet:
+              path: /healthz/readiness
+              port: metrics
+            timeoutSeconds: 5
           livenessProbe:
             httpGet:
-              path: /metrics
+              path: /healthz/liveness
               port: metrics
+            timeoutSeconds: 5
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true