Merge pull request #3844 from nshankar13/add_metric_proxy_reconnect

feat(metrics): proxy reconnect count
openservicemesh · Jul 26, 2021 · 8a80bd2 · 8a80bd2
2 parents 53e8bc3 + 6fb139f
commit 8a80bd2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/cmd/osm-controller/osm-controller.go b/cmd/osm-controller/osm-controller.go
@@ -301,6 +301,7 @@ func startMetricsStore() {
 		metricsstore.DefaultMetricsStore.K8sMeshPodCount,
 		metricsstore.DefaultMetricsStore.K8sMeshServiceCount,
 		metricsstore.DefaultMetricsStore.ProxyConnectCount,
+		metricsstore.DefaultMetricsStore.ProxyReconnectCount,
 		metricsstore.DefaultMetricsStore.ProxyConfigUpdateTime,
 		metricsstore.DefaultMetricsStore.CertIssuedCount,
 		metricsstore.DefaultMetricsStore.CertIssuedTime,

diff --git a/pkg/envoy/ads/stream.go b/pkg/envoy/ads/stream.go
@@ -235,6 +235,7 @@ func respondToRequest(proxy *envoy.Proxy, discoveryRequest *xds_discovery.Discov
 			proxy.String(), typeURL.Short(), requestNonce, requestVersion)
 		proxy.SetLastSentVersion(typeURL, requestVersion)
 		proxy.SetLastAppliedVersion(typeURL, requestVersion)
+		metricsstore.DefaultMetricsStore.ProxyReconnectCount.Inc()
 		return true
 	}
 

diff --git a/pkg/metricsstore/metricsstore.go b/pkg/metricsstore/metricsstore.go
@@ -37,6 +37,9 @@ type MetricsStore struct {
 	// ProxyConnectCount is the metric for the total number of proxies connected to the controller
 	ProxyConnectCount prometheus.Gauge
 
+	// ProxyReconnectCount is the metric for the total reconnects from known proxies to the controller
+	ProxyReconnectCount prometheus.Counter
+
 	// ProxyConfigUpdateTime is the histogram to track time spent for proxy configuration and its occurrences
 	ProxyConfigUpdateTime *prometheus.HistogramVec
 
@@ -111,6 +114,13 @@ func init() {
 		Help:      "represents the number of proxies connected to OSM controller",
 	})
 
+	defaultMetricsStore.ProxyReconnectCount = prometheus.NewCounter(prometheus.CounterOpts{
+		Namespace: metricsRootNamespace,
+		Subsystem: "proxy",
+		Name:      "reconnect_count",
+		Help:      "represents the number of reconnects from known proxies to OSM controller",
+	})
+
 	defaultMetricsStore.ProxyConfigUpdateTime = prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
 			Namespace: metricsRootNamespace,