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

Jump to bottom

Use sumologic.com as prefix for internal labels #734

Merged
merged 3 commits into from
Jun 16, 2020
Merged

Use sumologic.com as prefix for internal labels #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd5507b
Use sumologic.com as prefix for internal labels
Jun 16, 2020
5380f9a
Generate new 'fluentd-sumologic.yaml.tmpl'
Jun 16, 2020
028f586
Generate new overrides yaml/libsonnet file(s).
Jun 16, 2020
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
16 changes: 8 additions & 8 deletions deploy/helm/prometheus-overrides.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,37 +78,37 @@ prometheus:
additionalServiceMonitors:
- name: collection-sumologic-fluentd-logs
additionalLabels:
sumologic/app: fluentd-logs
sumologic.com/app: fluentd-logs
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-logs
sumologic.com/app: fluentd-logs
- name: collection-sumologic-fluentd-metrics
additionalLabels:
sumologic/app: fluentd-metrics
sumologic.com/app: fluentd-metrics
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-metrics
sumologic.com/app: fluentd-metrics
- name: collection-sumologic-fluentd-events
additionalLabels:
sumologic/app: fluentd-events
sumologic.com/app: fluentd-events
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-events
sumologic.com/app: fluentd-events
- name: collection-fluent-bit
additionalLabels:
app: collection-fluent-bit
Expand All @@ -123,15 +123,15 @@ prometheus:
app: fluent-bit
- name: collection-sumologic-otelcol
additionalLabels:
sumologic/app: otelcol
sumologic.com/app: otelcol
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: otelcol
sumologic.com/app: otelcol
prometheusSpec:
## Prometheus default scrape interval, default from upstream Prometheus Operator Helm chart
## NOTE changing the scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
Expand Down
16 changes: 8 additions & 8 deletions deploy/helm/sumologic/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,23 +272,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
{{- end -}}

{{- define "sumologic.labels.logs" -}}
sumologic/app: fluentd-logs
sumologic/component: logs
sumologic.com/app: fluentd-logs
sumologic.com/component: logs
{{- end -}}

{{- define "sumologic.labels.metrics" -}}
sumologic/app: fluentd-metrics
sumologic/component: metrics
sumologic.com/app: fluentd-metrics
sumologic.com/component: metrics
{{- end -}}

{{- define "sumologic.labels.events" -}}
sumologic/app: fluentd-events
sumologic/component: events
sumologic.com/app: fluentd-events
sumologic.com/component: events
{{- end -}}

{{- define "sumologic.labels.traces" -}}
sumologic/app: otelcol
sumologic/component: traces
sumologic.com/app: otelcol
sumologic.com/component: traces
{{- end -}}

{{/*
Expand Down
16 changes: 8 additions & 8 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,37 +809,37 @@ prometheus-operator:
additionalServiceMonitors:
- name: collection-sumologic-fluentd-logs
additionalLabels:
sumologic/app: fluentd-logs
sumologic.com/app: fluentd-logs
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-logs
sumologic.com/app: fluentd-logs
- name: collection-sumologic-fluentd-metrics
additionalLabels:
sumologic/app: fluentd-metrics
sumologic.com/app: fluentd-metrics
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-metrics
sumologic.com/app: fluentd-metrics
- name: collection-sumologic-fluentd-events
additionalLabels:
sumologic/app: fluentd-events
sumologic.com/app: fluentd-events
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: fluentd-events
sumologic.com/app: fluentd-events
- name: collection-fluent-bit
additionalLabels:
app: collection-fluent-bit
Expand All @@ -854,15 +854,15 @@ prometheus-operator:
app: fluent-bit
- name: collection-sumologic-otelcol
additionalLabels:
sumologic/app: otelcol
sumologic.com/app: otelcol
endpoints:
- port: metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
sumologic/app: otelcol
sumologic.com/app: otelcol
prometheusSpec:
## Prometheus default scrape interval, default from upstream Prometheus Operator Helm chart
## NOTE changing the scrape interval to be >1m can result in metrics from recording rules to be missing and empty panels in Sumo Logic Kubernetes apps.
Expand Down
24 changes: 12 additions & 12 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,8 @@ metadata:
name: collection-sumologic-fluentd-events-headless
labels:
app: collection-sumologic-fluentd-events-headless
sumologic/app: fluentd-events
sumologic/component: events
sumologic.com/app: fluentd-events
sumologic.com/component: events

spec:
selector:
Expand All @@ -639,8 +639,8 @@ metadata:
name: collection-sumologic-fluentd-events
labels:
app: collection-sumologic-fluentd-events
sumologic/app: fluentd-events
sumologic/component: events
sumologic.com/app: fluentd-events
sumologic.com/component: events

spec:
selector:
Expand All @@ -659,8 +659,8 @@ metadata:
name: collection-sumologic-fluentd-metrics-headless
labels:
app: collection-sumologic-fluentd-metrics-headless
sumologic/app: fluentd-metrics
sumologic/component: metrics
sumologic.com/app: fluentd-metrics
sumologic.com/component: metrics

spec:
selector:
Expand All @@ -685,8 +685,8 @@ metadata:
name: collection-sumologic-fluentd-metrics
labels:
app: collection-sumologic-fluentd-metrics
sumologic/app: fluentd-metrics
sumologic/component: metrics
sumologic.com/app: fluentd-metrics
sumologic.com/component: metrics

spec:
selector:
Expand All @@ -710,8 +710,8 @@ metadata:
name: collection-sumologic-fluentd-logs-headless
labels:
app: collection-sumologic-fluentd-logs-headless
sumologic/app: fluentd-logs
sumologic/component: logs
sumologic.com/app: fluentd-logs
sumologic.com/component: logs

spec:
selector:
Expand All @@ -736,8 +736,8 @@ metadata:
name: collection-sumologic-fluentd-logs
labels:
app: collection-sumologic-fluentd-logs
sumologic/app: fluentd-logs
sumologic/component: logs
sumologic.com/app: fluentd-logs
sumologic.com/component: logs

spec:
selector:
Expand Down