helm upgrade and uninstall metric gathering (#657)

Signed-off-by: Kartikey Mamgain <[email protected]>

Signed-off-by: Kartikey Mamgain <[email protected]>

Author: Kartikey-star

docs/gathered-data.md

@@ -568,6 +568,8 @@ Gathered metrics:
 	vsphere_node_hw_version_total
 	namespace CPU and memory usage
 	console_helm_installs_total
+	console_helm_upgrades_total
+	console_helm_uninstalls_total
 	followed by at most 1000 lines of ALERTS metric
 
 * Location in archive: config/metrics
@@ -582,6 +584,8 @@ Gathered metrics:
   - "virt_platform metric": 4.6.34+, 4.7.16+, 4.8+
   - "vsphere_node_hw_version_total": 4.7.11+, 4.8+
   - "console_helm_installs_total": 4.11+
+  - "console_helm_upgrades_total": 4.12+
+  - "console_helm_uninstalls_total": 4.12+
 
 
 ## MutatingWebhookConfigurations

docs/insights-archive-sample/config/metrics

@@ -1,5 +1,13 @@
 # TYPE cluster_installer untyped
 cluster_installer{endpoint="metrics",instance="10.0.0.4:9099",invoker="openshift-internal-ci/release-openshift-origin-installer-launch-gcp/1275022284997791744",job="cluster-version-operator",namespace="openshift-cluster-version",pod="cluster-version-operator-5f7b8d89b5-t9cdr",service="cluster-version-operator",type="openshift-install",version="v4.4.0",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-1"} 1 1592829361218
+# TYPE console_helm_installs_total untyped
+console_helm_installs_total{chart_name="elasticsearch-sed",chart_version="1.0.0",container="console",endpoint="https",instance="10.129.0.63:8443",job="console",namespace="openshift-console",pod="console-8d5d6d756-6nscn",service="console",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-0"} 1 1660729192308
+console_helm_installs_total{chart_name="redis-sed",chart_version="1.0.1",container="console",endpoint="https",instance="10.129.0.63:8443",job="console",namespace="openshift-console",pod="console-8d5d6d756-6nscn",service="console",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-0"} 1 1660729192308
+# TYPE console_helm_uninstalls_total untyped
+console_helm_uninstalls_total{chart_name="redis-sed",chart_version="1.0.1",container="console",endpoint="https",instance="10.129.0.63:8443",job="console",namespace="openshift-console",pod="console-8d5d6d756-6nscn",service="console",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-0"} 1 1660729192308
+# TYPE console_helm_upgrades_total untyped
+console_helm_upgrades_total{chart_name="elasticsearch-sed",chart_version="1.0.0",container="console",endpoint="https",instance="10.129.0.63:8443",job="console",namespace="openshift-console",pod="console-8d5d6d756-6nscn",service="console",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-0"} 1 1660729192308
+console_helm_upgrades_total{chart_name="redis-sed",chart_version="1.0.1",container="console",endpoint="https",instance="10.129.0.63:8443",job="console",namespace="openshift-console",pod="console-8d5d6d756-6nscn",service="console",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-0"} 1 1660729192308
 # TYPE etcd_object_counts untyped
 etcd_object_counts{apiserver="kube-apiserver",endpoint="https",instance="10.0.0.3:6443",job="apiserver",namespace="default",resource="dnses.operator.openshift.io",service="kubernetes",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-1"} 1 1592829364899
 etcd_object_counts{apiserver="kube-apiserver",endpoint="https",instance="10.0.0.3:6443",job="apiserver",namespace="default",resource="apiservers.config.openshift.io",service="kubernetes",prometheus="openshift-monitoring/k8s",prometheus_replica="prometheus-k8s-1"} 1 1592829364899

pkg/gatherers/clusterconfig/recent_metrics.go

@@ -32,6 +32,8 @@ const (
 //	vsphere_node_hw_version_total
 //	namespace CPU and memory usage
 //	console_helm_installs_total
+//	console_helm_upgrades_total
+//	console_helm_uninstalls_total
 //	followed by at most 1000 lines of ALERTS metric
 //
 // * Location in archive: config/metrics
@@ -46,6 +48,8 @@ const (
 //   - "virt_platform metric": 4.6.34+, 4.7.16+, 4.8+
 //   - "vsphere_node_hw_version_total": 4.7.11+, 4.8+
 //   - "console_helm_installs_total": 4.11+
+//   - "console_helm_upgrades_total": 4.12+
+//   - "console_helm_uninstalls_total": 4.12+
 func (g *Gatherer) GatherMostRecentMetrics(ctx context.Context) ([]record.Record, []error) {
 	metricsRESTClient, err := rest.RESTClientFor(g.metricsGatherKubeConfig)
 	if err != nil {
@@ -65,6 +69,8 @@ func gatherMostRecentMetrics(ctx context.Context, metricsClient rest.Interface)
 		Param("match[]", "vsphere_node_hw_version_total").
 		Param("match[]", "virt_platform").
 		Param("match[]", "console_helm_installs_total").
+		Param("match[]", "console_helm_upgrades_total").
+		Param("match[]", "console_helm_uninstalls_total").
 		DoRaw(ctx)
 	if err != nil {
 		klog.Errorf("Unable to retrieve most recent metrics: %v", err)