Skip to content

Commit cce4d37

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #309 from vyzigold/move_metricstorage_const
Move metricstorage consts to api
2 parents 9d34f17 + efa551b commit cce4d37

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

‎pkg/metricstorage/const.go‎ renamed to ‎api/v1beta1/metricstorage_consts.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
1313
limitations under the License.
1414
*/
1515

16-
package metricstorage
16+
package v1beta1
1717

1818
import "time"
1919

‎controllers/autoscaling_controller.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
5656
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
5757
autoscaling "github.com/openstack-k8s-operators/telemetry-operator/pkg/autoscaling"
58-
metricstorage "github.com/openstack-k8s-operators/telemetry-operator/pkg/metricstorage"
5958
)
6059

6160
// AutoscalingReconciler reconciles a Autoscaling object
@@ -403,12 +402,12 @@ func (r *AutoscalingReconciler) reconcileNormal(
403402
// NOTE: Always do this before calling the generateServiceConfig to get the newest values in the ServiceConfig
404403
//
405404
if instance.Spec.PrometheusHost == "" {
406-
instance.Status.PrometheusHost = fmt.Sprintf("%s-prometheus.%s.svc", metricstorage.DefaultServiceName, instance.Namespace)
405+
instance.Status.PrometheusHost = fmt.Sprintf("%s-prometheus.%s.svc", telemetryv1.DefaultServiceName, instance.Namespace)
407406
} else {
408407
instance.Status.PrometheusHost = instance.Spec.PrometheusHost
409408
}
410409
if instance.Spec.PrometheusPort == 0 {
411-
instance.Status.PrometheusPort = metricstorage.DefaultPrometheusPort
410+
instance.Status.PrometheusPort = telemetryv1.DefaultPrometheusPort
412411
} else {
413412
instance.Status.PrometheusPort = instance.Spec.PrometheusPort
414413
}

‎controllers/metricstorage_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func (r *MetricStorageReconciler) reconcileNormal(
216216
condition.SeverityError,
217217
telemetryv1.MonitoringStackUnableToOwnMessage, err)
218218
Log.Info("Can't own MonitoringStack resource")
219-
return ctrl.Result{RequeueAfter: metricstorage.PauseBetweenWatchAttempts}, nil
219+
return ctrl.Result{RequeueAfter: telemetryv1.PauseBetweenWatchAttempts}, nil
220220
}
221221

222222
monitoringStack := &obov1.MonitoringStack{
@@ -274,7 +274,7 @@ func (r *MetricStorageReconciler) reconcileNormal(
274274
condition.SeverityError,
275275
telemetryv1.ServiceMonitorUnableToOwnMessage, err)
276276
Log.Info("Can't own ServiceMonitor resource")
277-
return ctrl.Result{RequeueAfter: metricstorage.PauseBetweenWatchAttempts}, nil
277+
return ctrl.Result{RequeueAfter: telemetryv1.PauseBetweenWatchAttempts}, nil
278278
}
279279
ceilometerMonitor := &monv1.ServiceMonitor{
280280
ObjectMeta: metav1.ObjectMeta{
@@ -332,7 +332,7 @@ func (r *MetricStorageReconciler) reconcileNormal(
332332
condition.SeverityError,
333333
telemetryv1.NodeSetUnableToWatchMessage, err)
334334
Log.Info("Can't watch OpenStackDataPlaneNodeSet resource")
335-
return ctrl.Result{RequeueAfter: metricstorage.PauseBetweenWatchAttempts}, nil
335+
return ctrl.Result{RequeueAfter: telemetryv1.PauseBetweenWatchAttempts}, nil
336336
}
337337
instance.Status.Conditions.MarkTrue(telemetryv1.NodeSetReadyCondition, condition.ReadyMessage)
338338

@@ -354,7 +354,7 @@ func (r *MetricStorageReconciler) reconcileNormal(
354354
condition.SeverityError,
355355
telemetryv1.ScrapeConfigUnableToOwnMessage, err)
356356
Log.Info("Can't own ScrapeConfig resource")
357-
return ctrl.Result{RequeueAfter: metricstorage.PauseBetweenWatchAttempts}, nil
357+
return ctrl.Result{RequeueAfter: telemetryv1.PauseBetweenWatchAttempts}, nil
358358
}
359359
op, err = controllerutil.CreateOrPatch(ctx, r.Client, scrapeConfig, func() error {
360360
endpoints, err := getNodeExporterTargets(instance, helper)
@@ -463,7 +463,7 @@ func getNodeExporterTargets(
463463
// we were unable to find an IP or HostName for a node, so we do not go further
464464
return addresses, nil
465465
}
466-
addresses = append(addresses, fmt.Sprintf("%s:%d", address, metricstorage.DefaultNodeExporterPort))
466+
addresses = append(addresses, fmt.Sprintf("%s:%d", address, telemetryv1.DefaultNodeExporterPort))
467467
}
468468
}
469469
return addresses, nil

‎controllers/telemetry_controller.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
telemetryv1 "github.com/openstack-k8s-operators/telemetry-operator/api/v1beta1"
3838
ceilometer "github.com/openstack-k8s-operators/telemetry-operator/pkg/ceilometer"
3939
logging "github.com/openstack-k8s-operators/telemetry-operator/pkg/logging"
40-
metricstorage "github.com/openstack-k8s-operators/telemetry-operator/pkg/metricstorage"
4140
telemetry "github.com/openstack-k8s-operators/telemetry-operator/pkg/telemetry"
4241
obov1 "github.com/rhobs/observability-operator/pkg/apis/monitoring/v1alpha1"
4342
)
@@ -371,11 +370,11 @@ func reconcileMetricStorage(ctx context.Context, instance *telemetryv1.Telemetry
371370
const (
372371
metricStorageNamespaceLabel = "MetricStorage.Namespace"
373372
metricStorageNameLabel = "MetricStorage.Name"
374-
metricStorageName = metricstorage.DefaultServiceName
373+
metricStorageName = telemetryv1.DefaultServiceName
375374
)
376375
metricStorageInstance := &telemetryv1.MetricStorage{
377376
ObjectMeta: metav1.ObjectMeta{
378-
Name: metricstorage.DefaultServiceName,
377+
Name: telemetryv1.DefaultServiceName,
379378
Namespace: instance.Namespace,
380379
},
381380
}
@@ -388,7 +387,7 @@ func reconcileMetricStorage(ctx context.Context, instance *telemetryv1.Telemetry
388387
return ctrl.Result{}, nil
389388
}
390389

391-
helper.GetLogger().Info("Reconciling MetricStorage", metricStorageNamespaceLabel, instance.Namespace, metricStorageNameLabel, metricstorage.DefaultServiceName)
390+
helper.GetLogger().Info("Reconciling MetricStorage", metricStorageNamespaceLabel, instance.Namespace, metricStorageNameLabel, telemetryv1.DefaultServiceName)
392391
op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), metricStorageInstance, func() error {
393392
if instance.Spec.MetricStorage.MetricStorageSpec.CustomMonitoringStack != nil {
394393
metricStorageInstance.Spec.CustomMonitoringStack = &obov1.MonitoringStackSpec{}
@@ -416,7 +415,7 @@ func reconcileMetricStorage(ctx context.Context, instance *telemetryv1.Telemetry
416415
return ctrl.Result{}, err
417416
}
418417
if op != controllerutil.OperationResultNone {
419-
helper.GetLogger().Info(fmt.Sprintf("%s %s - %s", metricstorage.DefaultServiceName, metricStorageInstance.Name, op))
418+
helper.GetLogger().Info(fmt.Sprintf("%s %s - %s", telemetryv1.DefaultServiceName, metricStorageInstance.Name, op))
420419
}
421420

422421
if metricStorageInstance.IsReady() {

‎pkg/metricstorage/monitoring_stack.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func MonitoringStack(
5151
Disabled: !instance.Spec.MonitoringStack.AlertingEnabled,
5252
},
5353
PrometheusConfig: &obov1.PrometheusConfig{
54-
Replicas: &PrometheusReplicas,
54+
Replicas: &telemetryv1.PrometheusReplicas,
5555
// NOTE: unsupported before OBOv0.0.21, but we can set the value
5656
// in the ServiceMonitor, so this isn't a big deal.
5757
//ScrapeInterval: instance.Spec.MonitoringStack.ScrapeInterval,
@@ -84,7 +84,7 @@ func getPVCSpec(instance *telemetryv1.MetricStorage) (*corev1.PersistentVolumeCl
8484
// the persistent field is omited, we won't have anything in
8585
// persistentSpec.PvcStorageRequest and we need to set the default
8686
// value like this here.
87-
quantity, err = resource.ParseQuantity(DefaultPvcStorageRequest)
87+
quantity, err = resource.ParseQuantity(telemetryv1.DefaultPvcStorageRequest)
8888
} else {
8989
quantity, err = resource.ParseQuantity(persistentSpec.PvcStorageRequest)
9090
}

‎pkg/metricstorage/scrape_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func ScrapeConfig(
4040
//} else if instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval {
4141
// scrapeInterval = instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval
4242
} else {
43-
scrapeInterval = DefaultScrapeInterval
43+
scrapeInterval = telemetryv1.DefaultScrapeInterval
4444
}
4545
scrapeConfig := &unstructured.Unstructured{}
4646
scrapeConfig.SetUnstructuredContent(map[string]interface{}{

‎pkg/metricstorage/service_monitor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func ServiceMonitor(
3535
//} else if instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval {
3636
// scrapeInterval = instance.Spec.CustomMonitoringStack.PrometheusConfig.ScrapeInterval
3737
} else {
38-
scrapeInterval = DefaultScrapeInterval
38+
scrapeInterval = telemetryv1.DefaultScrapeInterval
3939
}
4040

4141
serviceMonitor := &monv1.ServiceMonitor{

0 commit comments

Comments
 (0)