Merge pull request #2142 from kube-logging/fix/sm-anomalies

fix: servicemonitor missing fields, anomalies

Author: csatib02

pkg/resources/fluentbit/service.go

@@ -66,6 +66,8 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
 				Endpoints: []v1.Endpoint{{
 					Port:                 "http-metrics",
 					Path:                 r.fluentbitSpec.Metrics.Path,
+					Interval:             v1.Duration(r.fluentbitSpec.Metrics.Interval),
+					ScrapeTimeout:        v1.Duration(r.fluentbitSpec.Metrics.Timeout),
 					HonorLabels:          r.fluentbitSpec.Metrics.ServiceMonitorConfig.HonorLabels,
 					RelabelConfigs:       r.fluentbitSpec.Metrics.ServiceMonitorConfig.Relabelings,
 					MetricRelabelConfigs: r.fluentbitSpec.Metrics.ServiceMonitorConfig.MetricsRelabelings,
@@ -136,8 +138,8 @@ func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.D
 					HonorLabels:          r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.HonorLabels,
 					RelabelConfigs:       r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.Relabelings,
 					MetricRelabelConfigs: r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.MetricsRelabelings,
-					Scheme:               r.fluentbitSpec.Metrics.ServiceMonitorConfig.Scheme,
-					TLSConfig:            r.fluentbitSpec.Metrics.ServiceMonitorConfig.TLSConfig,
+					Scheme:               r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme,
+					TLSConfig:            r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.TLSConfig,
 				}},
 				Selector:          v12.LabelSelector{MatchLabels: r.getFluentBitLabels()},
 				NamespaceSelector: v1.NamespaceSelector{MatchNames: []string{r.Logging.Spec.FluentbitAgentNamespace}},

pkg/resources/syslogng/service.go

@@ -115,14 +115,15 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
 				TargetLabels:    nil,
 				PodTargetLabels: nil,
 				Endpoints: []v1.Endpoint{{
-					Port:           "http-metrics",
-					Path:           r.syslogNGSpec.Metrics.Path,
-					Interval:       v1.Duration(r.syslogNGSpec.Metrics.Interval),
-					ScrapeTimeout:  v1.Duration(r.syslogNGSpec.Metrics.Timeout),
-					HonorLabels:    r.syslogNGSpec.Metrics.ServiceMonitorConfig.HonorLabels,
-					RelabelConfigs: r.syslogNGSpec.Metrics.ServiceMonitorConfig.Relabelings,
-					TLSConfig:      r.syslogNGSpec.Metrics.ServiceMonitorConfig.TLSConfig,
-					Scheme:         r.syslogNGSpec.Metrics.ServiceMonitorConfig.Scheme,
+					Port:                 "http-metrics",
+					Path:                 r.syslogNGSpec.Metrics.Path,
+					Interval:             v1.Duration(r.syslogNGSpec.Metrics.Interval),
+					ScrapeTimeout:        v1.Duration(r.syslogNGSpec.Metrics.Timeout),
+					HonorLabels:          r.syslogNGSpec.Metrics.ServiceMonitorConfig.HonorLabels,
+					RelabelConfigs:       r.syslogNGSpec.Metrics.ServiceMonitorConfig.Relabelings,
+					MetricRelabelConfigs: r.syslogNGSpec.Metrics.ServiceMonitorConfig.MetricsRelabelings,
+					Scheme:               r.syslogNGSpec.Metrics.ServiceMonitorConfig.Scheme,
+					TLSConfig:            r.syslogNGSpec.Metrics.ServiceMonitorConfig.TLSConfig,
 				}},
 				Selector:          v12.LabelSelector{MatchLabels: r.Logging.GetSyslogNGLabels(ComponentSyslogNG)},
 				NamespaceSelector: v1.NamespaceSelector{MatchNames: []string{r.Logging.Spec.ControlNamespace}},
@@ -194,8 +195,8 @@ func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.D
 					HonorLabels:          r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.HonorLabels,
 					RelabelConfigs:       r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.Relabelings,
 					MetricRelabelConfigs: r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.MetricsRelabelings,
-					TLSConfig:            r.syslogNGSpec.Metrics.ServiceMonitorConfig.TLSConfig,
-					Scheme:               r.syslogNGSpec.Metrics.ServiceMonitorConfig.Scheme,
+					Scheme:               r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme,
+					TLSConfig:            r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.TLSConfig,
 				}},
 				Selector:          v12.LabelSelector{MatchLabels: r.Logging.GetSyslogNGLabels(ComponentSyslogNG)},
 				NamespaceSelector: v1.NamespaceSelector{MatchNames: []string{r.Logging.Spec.ControlNamespace}},