From 9cde058d3dfa1b62fd1acd4e7845c22fe292b029 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Mon, 7 Oct 2019 15:40:22 -0600
Subject: [PATCH] Bug 1701495: Eventrouter pod in CrashLoopBackOff status:
 "runtime error: invalid memory address or nil pointer dereference"

https://bugzilla.redhat.com/show_bug.cgi?id=1701495
---
 eventrouter.go        | 45 ++++++++++++++++++++++++++++++++++++++++---
 yaml/eventrouter.yaml |  2 +-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/eventrouter.go b/eventrouter.go
index bdcf1e8d4..764c8e490 100644
--- a/eventrouter.go
+++ b/eventrouter.go
@@ -23,7 +23,7 @@ import (
 	"github.com/openshift/eventrouter/sinks"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	coreinformers "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes"
@@ -52,11 +52,33 @@ var (
 		"reason",
 		"source",
 	})
+	kubernetesInfoEventCounterVec = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "heptio_eventrouter_info_total",
+		Help: "Total number of info events in the kubernetes cluster",
+	}, []string{
+		"involved_object_kind",
+		"involved_object_name",
+		"involved_object_namespace",
+		"reason",
+		"source",
+	})
+	kubernetesUnknownEventCounterVec = prometheus.NewCounterVec(prometheus.CounterOpts{
+		Name: "heptio_eventrouter_unknown_total",
+		Help: "Total number of events of unknown type in the kubernetes cluster",
+	}, []string{
+		"involved_object_kind",
+		"involved_object_name",
+		"involved_object_namespace",
+		"reason",
+		"source",
+	})
 )
 
 func init() {
 	prometheus.MustRegister(kubernetesWarningEventCounterVec)
 	prometheus.MustRegister(kubernetesNormalEventCounterVec)
+	prometheus.MustRegister(kubernetesInfoEventCounterVec)
+	prometheus.MustRegister(kubernetesUnknownEventCounterVec)
 }
 
 // EventRouter is responsible for maintaining a stream of kubernetes
@@ -127,7 +149,8 @@ func prometheusEvent(event *v1.Event) {
 	var counter prometheus.Counter
 	var err error
 
-	if event.Type == "Normal" {
+	switch event.Type {
+	case "Normal":
 		counter, err = kubernetesNormalEventCounterVec.GetMetricWithLabelValues(
 			event.InvolvedObject.Kind,
 			event.InvolvedObject.Name,
@@ -135,7 +158,7 @@ func prometheusEvent(event *v1.Event) {
 			event.Reason,
 			event.Source.Host,
 		)
-	} else if event.Type == "Warning" {
+	case "Warning":
 		counter, err = kubernetesWarningEventCounterVec.GetMetricWithLabelValues(
 			event.InvolvedObject.Kind,
 			event.InvolvedObject.Name,
@@ -143,6 +166,22 @@ func prometheusEvent(event *v1.Event) {
 			event.Reason,
 			event.Source.Host,
 		)
+	case "Info":
+		counter, err = kubernetesInfoEventCounterVec.GetMetricWithLabelValues(
+			event.InvolvedObject.Kind,
+			event.InvolvedObject.Name,
+			event.InvolvedObject.Namespace,
+			event.Reason,
+			event.Source.Host,
+		)
+	default:
+		counter, err = kubernetesUnknownEventCounterVec.GetMetricWithLabelValues(
+			event.InvolvedObject.Kind,
+			event.InvolvedObject.Name,
+			event.InvolvedObject.Namespace,
+			event.Reason,
+			event.Source.Host,
+		)
 	}
 
 	if err != nil {
diff --git a/yaml/eventrouter.yaml b/yaml/eventrouter.yaml
index eeacf04eb..84dab9799 100644
--- a/yaml/eventrouter.yaml
+++ b/yaml/eventrouter.yaml
@@ -51,7 +51,7 @@ metadata:
   name: eventrouter-cm
   namespace: kube-system
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: eventrouter