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

optional metrics resources #683

Merged
merged 21 commits into from
Jun 1, 2020
Merged

optional metrics resources #683

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
662413c
add enabled check for metrics sts
vsinghal13 May 26, 2020
9deefdd
add comments
vsinghal13 May 26, 2020
ef2cdee
Generate new 'fluentd-sumologic.yaml.tmpl'
May 26, 2020
db3f33e
change check flag to prometheus-operator
vsinghal13 May 27, 2020
af3d59a
Merge branch 'vsinghal-optional-metrics-resources' of https://github.…
vsinghal13 May 27, 2020
b68fb1b
add checks for service, and configmap as well
vsinghal13 May 27, 2020
81097e6
change eq to index to support - in prometheus-operator
vsinghal13 May 27, 2020
d94351a
Generate new 'fluentd-sumologic.yaml.tmpl'
May 27, 2020
316fa67
change metrics resources to metrics.enabled check
vsinghal13 May 27, 2020
90ccb86
add check for logs recources
vsinghal13 May 27, 2020
8ab0e3f
Merge branch 'vsinghal-optional-metrics-resources' of https://github.…
vsinghal13 May 27, 2020
6a54963
Generate new 'fluentd-sumologic.yaml.tmpl'
May 27, 2020
b134eb4
Generate new overrides yaml/libsonnet file(s).
May 27, 2020
2e3ed8e
change logs resources to sumologic.logs.enabled
vsinghal13 May 29, 2020
0308a3b
metrics resources to sumologic.metrics.enabled
vsinghal13 May 29, 2020
487815e
change values and requirements
vsinghal13 May 29, 2020
683732b
Generate new 'fluentd-sumologic.yaml.tmpl'
May 29, 2020
ac8c103
Generate new overrides yaml/libsonnet file(s).
May 29, 2020
adc687a
Apply suggestions from code review
vsinghal13 Jun 1, 2020
33db6ae
Update requirements.yaml
vsinghal13 Jun 1, 2020
e1298e6
Generate new 'fluentd-sumologic.yaml.tmpl'
Jun 1, 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
4 changes: 3 additions & 1 deletion deploy/helm/sumologic/templates/metrics-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if index .Values "prometheus-operator" "enabled" }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -9,4 +10,5 @@ data:
fluent.conf: |-
{{- .Values.fluentd.metrics.rawConfig | nindent 4 }}
{{- (tpl (.Files.Glob "conf/*.conf").AsConfig .) | nindent 2 }}
{{- (tpl (.Files.Glob "conf/metrics/*.conf").AsConfig .) | nindent 2 }}
{{- (tpl (.Files.Glob "conf/metrics/*.conf").AsConfig .) | nindent 2 }}
{{- end }}
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/metrics-service-headless.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if index .Values "prometheus-operator" "enabled" }}
apiVersion: v1
kind: Service
metadata:
Expand All @@ -18,3 +19,4 @@ spec:
port: 24231
targetPort: 24231
protocol: TCP
{{- end }}
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/metrics-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if index .Values "prometheus-operator" "enabled" }}
apiVersion: v1
kind: Service
metadata:
Expand All @@ -17,3 +18,4 @@ spec:
port: 24231
targetPort: 24231
protocol: TCP
{{- end }}
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/templates/metrics-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if index .Values "prometheus-operator" "enabled" }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
Expand Down Expand Up @@ -160,4 +161,5 @@ spec:
resources:
requests:
storage: {{ .Values.fluentd.persistence.size }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ data:

---
# Source: sumologic/templates/metrics-configmap.yaml

apiVersion: v1
kind: ConfigMap
metadata:
Expand Down Expand Up @@ -588,6 +589,7 @@ spec:
protocol: TCP
---
# Source: sumologic/templates/metrics-service-headless.yaml

apiVersion: v1
kind: Service
metadata:
Expand All @@ -611,6 +613,7 @@ spec:

---
# Source: sumologic/templates/metrics-service.yaml

apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -747,6 +750,7 @@ spec:
key: endpoint-events
---
# Source: sumologic/templates/metrics-statefulset.yaml

apiVersion: apps/v1
kind: StatefulSet
metadata:
Expand Down