Merge pull request #627 from atyronesmith/add_openstack_network_exporter

exporters: add support for the openstack-network-exporter

Author: openshift-merge-bot[bot]

api/v1beta1/telemetry_consts.go

@@ -28,6 +28,8 @@ const (
 	DefaultNodeExporterPort = 9100
 	// DefaultPodmanExporterPort -
 	DefaultPodmanExporterPort = 9882
+	// DefaultDataplaneNodeExporterPort -
+	DefaultOpenStackNetworkExporterPort = 9105
 	// DefaultScrapeInterval -
 	DefaultScrapeInterval = "30s"
 	// PauseBetweenWatchAttempts -

controllers/metricstorage_controller.go

@@ -830,6 +830,12 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
 	if err != nil {
 		return ctrl.Result{}, err
 	}
+	// openstack network' exporters
+	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "openstack-network-exporter", telemetryv1.DefaultOpenStackNetworkExporterPort, false)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
 	err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "podman-exporter", telemetryv1.DefaultPodmanExporterPort, false)
 	if err != nil {
 		return ctrl.Result{}, err
@@ -1001,12 +1007,23 @@ func (r *MetricStorageReconciler) createDashboardObjects(ctx context.Context, in
 	// Deploy ConfigMaps for dashboards
 	// NOTE: Dashboards installed without the custom datasource will default to the openshift-monitoring prometheus causing unexpected results
 	if dataSourceSuccess {
+		// Only enable DPDK sections of dataplane dashboard if dpdk service is enabled on at least one nodeset
+		dpdkConnectionInfo, err := getComputeNodesConnectionInfo(instance, helper, telemetry.DpdkServiceName)
+		hasDpdk := false
+		if err != nil {
+			Log.Info(fmt.Sprintf("Cannot get compute node connection info for dpdk service: %s", err))
+		} else {
+			if len(dpdkConnectionInfo) > 0 {
+				hasDpdk = true
+			}
+		}
 		dashboardCMs := map[string]*corev1.ConfigMap{
-			"grafana-dashboard-openstack-cloud":           dashboards.OpenstackCloud(datasourceName),
-			"grafana-dashboard-openstack-node":            dashboards.OpenstackNode(datasourceName),
-			"grafana-dashboard-openstack-vm":              dashboards.OpenstackVM(datasourceName),
-			"grafana-dashboard-openstack-rabbitmq":        dashboards.OpenstackRabbitmq(datasourceName),
-			"grafana-dashboard-openstack-network-traffic": dashboards.OpenstackNetworkTraffic(datasourceName),
+			"grafana-dashboard-openstack-cloud":             dashboards.OpenstackCloud(datasourceName),
+			"grafana-dashboard-openstack-node":              dashboards.OpenstackNode(datasourceName),
+			"grafana-dashboard-openstack-openstack-network": dashboards.OpenstackOpenstackNetwork(datasourceName, hasDpdk),
+			"grafana-dashboard-openstack-vm":                dashboards.OpenstackVM(datasourceName),
+			"grafana-dashboard-openstack-rabbitmq":          dashboards.OpenstackRabbitmq(datasourceName),
+			"grafana-dashboard-openstack-network-traffic":   dashboards.OpenstackNetworkTraffic(datasourceName),
 		}
 
 		// atleast one nodeset must have "telemetry-power-monitoring" service enabled for kepler and ipmi dashboard to be created