Skip to content

Commit 4045dd8

Browse files
csatib02csatib02
authored
Merge pull request #2147 from kube-logging/fix/metrics-name-meta
fix: align metrics service names and reuse object metadata
2 parents 9c217ba + 45b3a37 commit 4045dd8

File tree

3 files changed

+36
-26
lines changed

3 files changed

+36
-26
lines changed

‎pkg/resources/fluentbit/service.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ import (
2626
)
2727

2828
func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, error) {
29+
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-metrics")
30+
2931
if r.fluentbitSpec.Metrics != nil && r.fluentbitSpec.Metrics.IsEnabled() {
3032
return &corev1.Service{
31-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-metrics"),
33+
ObjectMeta: objectMetadata,
3234
Spec: corev1.ServiceSpec{
3335
Ports: []corev1.ServicePort{
3436
{
@@ -45,19 +47,19 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState,
4547
}, reconciler.StatePresent, nil
4648
}
4749
return &corev1.Service{
48-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-monitor"),
50+
ObjectMeta: objectMetadata,
4951
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
5052
}
5153

5254
func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
5355
var SampleLimit uint64 = 0
56+
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-metrics")
5457

5558
if r.fluentbitSpec.Metrics.ServiceMonitorConfig.Scheme == "" {
5659
r.fluentbitSpec.Metrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
5760
}
5861

5962
if r.fluentbitSpec.Metrics != nil && r.fluentbitSpec.Metrics.IsEnabled() && r.fluentbitSpec.Metrics.ServiceMonitor {
60-
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-metrics")
6163
if r.fluentbitSpec.Metrics.ServiceMonitorConfig.AdditionalLabels != nil {
6264
for k, v := range r.fluentbitSpec.Metrics.ServiceMonitorConfig.AdditionalLabels {
6365
objectMetadata.Labels[k] = v
@@ -89,21 +91,22 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
8991
}, reconciler.StatePresent, nil
9092
}
9193
return &v1.ServiceMonitor{
92-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-metrics"),
94+
ObjectMeta: objectMetadata,
9395
Spec: v1.ServiceMonitorSpec{},
9496
}, reconciler.StateAbsent, nil
9597
}
9698

9799
func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {
100+
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-metrics")
101+
98102
if r.fluentbitSpec.BufferVolumeMetrics != nil && r.fluentbitSpec.BufferVolumeMetrics.IsEnabled() {
99103
port := int32(defaultBufferVolumeMetricsPort)
100104
if r.fluentbitSpec.BufferVolumeMetrics.Port != 0 {
101105
port = r.fluentbitSpec.BufferVolumeMetrics.Port
102106
}
103107

104108
return &corev1.Service{
105-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-metrics"),
106-
109+
ObjectMeta: objectMetadata,
107110
Spec: corev1.ServiceSpec{
108111
Ports: []corev1.ServicePort{
109112
{
@@ -120,20 +123,19 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS
120123
}, reconciler.StatePresent, nil
121124
}
122125
return &corev1.Service{
123-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-monitor"),
126+
ObjectMeta: objectMetadata,
124127
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
125128
}
126129

127130
func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
128131
var SampleLimit uint64 = 0
132+
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-metrics")
129133

130134
if r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme == "" {
131135
r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
132136
}
133137

134138
if r.fluentbitSpec.BufferVolumeMetrics != nil && r.fluentbitSpec.BufferVolumeMetrics.IsEnabled() && r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitor {
135-
objectMetadata := r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-metrics")
136-
137139
objectMetadata.Labels = util.MergeLabels(objectMetadata.Labels, r.fluentbitSpec.BufferVolumeMetrics.ServiceMonitorConfig.AdditionalLabels)
138140
return &v1.ServiceMonitor{
139141
ObjectMeta: objectMetadata,
@@ -159,7 +161,7 @@ func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.D
159161
}, reconciler.StatePresent, nil
160162
}
161163
return &v1.ServiceMonitor{
162-
ObjectMeta: r.FluentbitObjectMeta(fluentbitServiceName + "-buffer-metrics"),
164+
ObjectMeta: objectMetadata,
163165
Spec: v1.ServiceMonitorSpec{},
164166
}, reconciler.StateAbsent, nil
165167
}

‎pkg/resources/fluentd/service.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ func (r *Reconciler) service() (runtime.Object, reconciler.DesiredState, error)
7070
}
7171

7272
func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, error) {
73+
objectMetadata := r.FluentdObjectMeta(ServiceName+"-metrics", ComponentFluentd)
74+
7375
if r.fluentdSpec.Metrics != nil && r.fluentdSpec.Metrics.IsEnabled() {
7476
desired := &corev1.Service{
75-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-metrics", ComponentFluentd),
77+
ObjectMeta: objectMetadata,
7678
Spec: corev1.ServiceSpec{
7779
Ports: []corev1.ServicePort{
7880
{
@@ -95,19 +97,19 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState,
9597
return desired, reconciler.StatePresent, nil
9698
}
9799
return &corev1.Service{
98-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-monitor", ComponentFluentd),
100+
ObjectMeta: objectMetadata,
99101
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
100102
}
101103

102104
func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
103105
var SampleLimit uint64 = 0
106+
objectMetadata := r.FluentdObjectMeta(ServiceName+"-metrics", ComponentFluentd)
104107

105108
if r.fluentdSpec.Metrics.ServiceMonitorConfig.Scheme == "" {
106109
r.fluentdSpec.Metrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
107110
}
108111

109112
if r.fluentdSpec.Metrics != nil && r.fluentdSpec.Metrics.IsEnabled() && r.fluentdSpec.Metrics.ServiceMonitor {
110-
objectMetadata := r.FluentdObjectMeta(ServiceName+"-metrics", ComponentFluentd)
111113
if r.fluentdSpec.Metrics.ServiceMonitorConfig.AdditionalLabels != nil {
112114
for k, v := range r.fluentdSpec.Metrics.ServiceMonitorConfig.AdditionalLabels {
113115
objectMetadata.Labels[k] = v
@@ -138,20 +140,22 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
138140
}, reconciler.StatePresent, nil
139141
}
140142
return &v1.ServiceMonitor{
141-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-metrics", ComponentFluentd),
143+
ObjectMeta: objectMetadata,
142144
Spec: v1.ServiceMonitorSpec{},
143145
}, reconciler.StateAbsent, nil
144146
}
145147

146148
func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {
149+
objectMetadata := r.FluentdObjectMeta(ServiceName+"-buffer-metrics", ComponentFluentd)
150+
147151
if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() {
148152
port := int32(defaultBufferVolumeMetricsPort)
149153
if r.fluentdSpec.BufferVolumeMetrics.Port != 0 {
150154
port = r.fluentdSpec.BufferVolumeMetrics.Port
151155
}
152156

153157
desired := &corev1.Service{
154-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-buffer-metrics", ComponentFluentd),
158+
ObjectMeta: objectMetadata,
155159
Spec: corev1.ServiceSpec{
156160
Ports: []corev1.ServicePort{
157161
{
@@ -174,19 +178,19 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS
174178
return desired, reconciler.StatePresent, nil
175179
}
176180
return &corev1.Service{
177-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-buffer-monitor", ComponentFluentd),
181+
ObjectMeta: objectMetadata,
178182
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
179183
}
180184

181185
func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
182186
var SampleLimit uint64 = 0
187+
objectMetadata := r.FluentdObjectMeta(ServiceName+"-buffer-metrics", ComponentFluentd)
183188

184189
if r.fluentdSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme == "" {
185190
r.fluentdSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
186191
}
187192

188193
if r.fluentdSpec.BufferVolumeMetrics != nil && r.fluentdSpec.BufferVolumeMetrics.IsEnabled() && r.fluentdSpec.BufferVolumeMetrics.ServiceMonitor {
189-
objectMetadata := r.FluentdObjectMeta(ServiceName+"-buffer-metrics", ComponentFluentd)
190194
if r.fluentdSpec.BufferVolumeMetrics.ServiceMonitorConfig.AdditionalLabels != nil {
191195
for k, v := range r.fluentdSpec.BufferVolumeMetrics.ServiceMonitorConfig.AdditionalLabels {
192196
objectMetadata.Labels[k] = v
@@ -216,7 +220,7 @@ func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.D
216220
}, reconciler.StatePresent, nil
217221
}
218222
return &v1.ServiceMonitor{
219-
ObjectMeta: r.FluentdObjectMeta(ServiceName+"-buffer-metrics", ComponentFluentd),
223+
ObjectMeta: objectMetadata,
220224
Spec: v1.ServiceMonitorSpec{},
221225
}, reconciler.StateAbsent, nil
222226
}

‎pkg/resources/syslogng/service.go‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ func (r *Reconciler) service() (runtime.Object, reconciler.DesiredState, error)
7070
}
7171

7272
func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState, error) {
73+
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-metrics", ComponentSyslogNG)
74+
7375
if r.syslogNGSpec.Metrics != nil && r.syslogNGSpec.Metrics.IsEnabled() {
7476
desired := &corev1.Service{
75-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-metrics", ComponentSyslogNG),
77+
ObjectMeta: objectMetadata,
7678
Spec: corev1.ServiceSpec{
7779
Ports: []corev1.ServicePort{
7880
{
@@ -95,19 +97,19 @@ func (r *Reconciler) serviceMetrics() (runtime.Object, reconciler.DesiredState,
9597
return desired, reconciler.StatePresent, nil
9698
}
9799
return &corev1.Service{
98-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-monitor", ComponentSyslogNG),
100+
ObjectMeta: objectMetadata,
99101
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
100102
}
101103

102104
func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
103105
var SampleLimit uint64 = 0
106+
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-metrics", ComponentSyslogNG)
104107

105108
if r.syslogNGSpec.Metrics.ServiceMonitorConfig.Scheme == "" {
106109
r.syslogNGSpec.Metrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
107110
}
108111

109112
if r.syslogNGSpec.Metrics != nil && r.syslogNGSpec.Metrics.IsEnabled() && r.syslogNGSpec.Metrics.ServiceMonitor {
110-
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-metrics", ComponentSyslogNG)
111113
if r.syslogNGSpec.Metrics.ServiceMonitorConfig.AdditionalLabels != nil {
112114
for k, v := range r.syslogNGSpec.Metrics.ServiceMonitorConfig.AdditionalLabels {
113115
objectMetadata.Labels[k] = v
@@ -138,20 +140,22 @@ func (r *Reconciler) monitorServiceMetrics() (runtime.Object, reconciler.Desired
138140
}, reconciler.StatePresent, nil
139141
}
140142
return &v1.ServiceMonitor{
141-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-metrics", ComponentSyslogNG),
143+
ObjectMeta: objectMetadata,
142144
Spec: v1.ServiceMonitorSpec{},
143145
}, reconciler.StateAbsent, nil
144146
}
145147

146148
func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredState, error) {
149+
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-buffer-metrics", ComponentSyslogNG)
150+
147151
if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() {
148152
port := int32(defaultBufferVolumeMetricsPort)
149153
if r.syslogNGSpec.BufferVolumeMetrics.Port != 0 {
150154
port = r.syslogNGSpec.BufferVolumeMetrics.Port
151155
}
152156

153157
desired := &corev1.Service{
154-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-buffer-metrics", ComponentSyslogNG),
158+
ObjectMeta: objectMetadata,
155159
Spec: corev1.ServiceSpec{
156160
Ports: []corev1.ServicePort{
157161
{
@@ -174,19 +178,19 @@ func (r *Reconciler) serviceBufferMetrics() (runtime.Object, reconciler.DesiredS
174178
return desired, reconciler.StatePresent, nil
175179
}
176180
return &corev1.Service{
177-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-buffer-monitor", ComponentSyslogNG),
181+
ObjectMeta: objectMetadata,
178182
Spec: corev1.ServiceSpec{}}, reconciler.StateAbsent, nil
179183
}
180184

181185
func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.DesiredState, error) {
182186
var SampleLimit uint64 = 0
187+
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-buffer-metrics", ComponentSyslogNG)
183188

184189
if r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme == "" {
185190
r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.Scheme = kubetool.To(v1.SchemeHTTP).String()
186191
}
187192

188193
if r.syslogNGSpec.BufferVolumeMetrics != nil && r.syslogNGSpec.BufferVolumeMetrics.IsEnabled() && r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitor {
189-
objectMetadata := r.SyslogNGObjectMeta(ServiceName+"-buffer-metrics", ComponentSyslogNG)
190194
if r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.AdditionalLabels != nil {
191195
for k, v := range r.syslogNGSpec.BufferVolumeMetrics.ServiceMonitorConfig.AdditionalLabels {
192196
objectMetadata.Labels[k] = v
@@ -216,7 +220,7 @@ func (r *Reconciler) monitorBufferServiceMetrics() (runtime.Object, reconciler.D
216220
}, reconciler.StatePresent, nil
217221
}
218222
return &v1.ServiceMonitor{
219-
ObjectMeta: r.SyslogNGObjectMeta(ServiceName+"-buffer-metrics", ComponentSyslogNG),
223+
ObjectMeta: objectMetadata,
220224
Spec: v1.ServiceMonitorSpec{},
221225
}, reconciler.StateAbsent, nil
222226
}

0 commit comments

Comments
 (0)