Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSPRH-12074] Use TLS for Kepler metrics #607

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[OSPRH-12074] Use TLS for Kepler metrics #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions controllers/metricstorage_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,16 +826,15 @@ func (r *MetricStorageReconciler) createScrapeConfigs(
}

// compute nodes' exporters
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "node-exporter", telemetryv1.DefaultNodeExporterPort, false)
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "node-exporter", telemetryv1.DefaultNodeExporterPort)
if err != nil {
return ctrl.Result{}, err
}
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "podman-exporter", telemetryv1.DefaultPodmanExporterPort, false)
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetry.ServiceName, "podman-exporter", telemetryv1.DefaultPodmanExporterPort)
if err != nil {
return ctrl.Result{}, err
}
// Currently Kepler doesn't support TLS
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetryv1.TelemetryPowerMonitoring, "kepler", telemetryv1.DefaultKeplerPort, true)
err = r.createComputeScrapeConfig(ctx, instance, helper, telemetryv1.TelemetryPowerMonitoring, "kepler", telemetryv1.DefaultKeplerPort)
if err != nil {
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -868,7 +867,6 @@ func (r *MetricStorageReconciler) createComputeScrapeConfig(
serviceName string,
exporterName string,
exporterPort int,
suppressTLS bool,
) error {
Log := r.GetLogger(ctx)

Expand All @@ -879,16 +877,11 @@ func (r *MetricStorageReconciler) createComputeScrapeConfig(
targetsTLS, targetsNonTLS := getExporterTargets(connectionInfo, exporterPort)

// ScrapeConfig for non-tls nodes
//NOTE(mmagr): remove TLS suppression functionality once Kepler supports TLS
targets := targetsNonTLS
if suppressTLS {
targets = targetsTLS
}
fullServiceName := fmt.Sprintf("%s-%s", telemetry.ServiceName, exporterName)
desiredScrapeConfig := metricstorage.ScrapeConfig(
instance,
serviceLabels,
targets,
targetsNonTLS,
false,
)
err = r.createServiceScrapeConfig(ctx, instance, Log, exporterName, fullServiceName, desiredScrapeConfig)
Expand All @@ -897,18 +890,16 @@ func (r *MetricStorageReconciler) createComputeScrapeConfig(
}

// ScrapeConfig for tls nodes
if !suppressTLS {
fullServiceName := fmt.Sprintf("%s-%s-tls", telemetry.ServiceName, exporterName)
desiredScrapeConfig := metricstorage.ScrapeConfig(
instance,
serviceLabels,
targetsTLS,
true,
)
err = r.createServiceScrapeConfig(ctx, instance, Log, exporterName, fullServiceName, desiredScrapeConfig)
if err != nil {
return err
}
fullServiceName = fmt.Sprintf("%s-%s-tls", telemetry.ServiceName, exporterName)
desiredScrapeConfig = metricstorage.ScrapeConfig(
instance,
serviceLabels,
targetsTLS,
true,
)
err = r.createServiceScrapeConfig(ctx, instance, Log, exporterName, fullServiceName, desiredScrapeConfig)
if err != nil {
return err
}
return nil
}
Expand Down