Enbale metrics with ipv6 (#2923)

F5Networks · Jun 12, 2023 · 7877b9b · 7877b9b
1 parent a32d991
commit 7877b9b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -51,6 +51,7 @@ Bug Fixes
 * `Issue 2632 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/2632>`_: Fix hubmode support with NodePortLocal
 * `Issue 2821 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/2821>`_: Fix for additionalVirtualAddresses with serviceAddress config
 * `Issue 2550 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/2550>`_: Ability to specify monitors for TransportServer CR
+* `Issue 2912 <https://github.com/F5Networks/k8s-bigip-ctlr/issues/2912>`_: Enable metrics with ipv6 mode
 * Fix for recreating the LTM objects when CIS restarts in IPAM mode.
 * Improved error handling for GTM objects with cccl-gtm-agent.
 * Fix crash issue with liveness probe in NextGen routes

diff --git a/pkg/controller/backend.go b/pkg/controller/backend.go
@@ -147,6 +147,9 @@ func NewAgent(params AgentParams) *Agent {
 			gtm,
 			params.PythonBaseDir,
 		)
+	} else {
+		// we only enable metrics as pythondriver is not initialized for ipv6
+		go agent.enableMetrics()
 	}
 	// Set the AS3 version for the agent
 	err = agent.IsBigIPAppServicesAvailable()

diff --git a/pkg/controller/pythonDriver.go b/pkg/controller/pythonDriver.go
@@ -207,3 +207,10 @@ func (agent *Agent) healthCheckPythonDriver() {
 	bigIPPrometheus.RegisterMetrics(agent.PostManager.HTTPClientMetrics)
 	log.Fatal(http.ListenAndServe(agent.HttpAddress, nil).Error())
 }
+
+func (agent *Agent) enableMetrics() {
+	// Expose Prometheus metrics
+	http.Handle("/metrics", promhttp.Handler())
+	bigIPPrometheus.RegisterMetrics(agent.PostManager.HTTPClientMetrics)
+	log.Fatal(http.ListenAndServe(agent.HttpAddress, nil).Error())
+}