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

Support installation behind proxy #692

Merged
merged 9 commits into from
Jun 1, 2020
Merged

Support installation behind proxy #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05e7a09
add support for extra env in events sts
vsinghal13 May 29, 2020
2d190f6
add proxy_uri in metrics output section
vsinghal13 May 29, 2020
1e04faf
add proxy env for terraform
vsinghal13 May 29, 2020
3732521
Generate new 'fluentd-sumologic.yaml.tmpl'
May 29, 2020
4b40885
Generate new 'setup-sumologic.yaml.tmpl'
May 29, 2020
1b2709a
Update metrics.output.conf
vsinghal13 May 29, 2020
17f351c
remove new line
vsinghal13 May 29, 2020
b2be7f8
Merge branch 'vsinghal-expose-proxy-uri' of https://github.com/SumoLo…
vsinghal13 May 29, 2020
5047c41
Generate new 'fluentd-sumologic.yaml.tmpl'
May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion deploy/helm/sumologic/conf/metrics/metrics.output.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
data_type metrics
metric_data_format prometheus
disable_cookies true
disable_cookies true
proxy_uri {{ .Values.fluentd.proxyUri | quote }}
4 changes: 4 additions & 0 deletions deploy/helm/sumologic/conf/setup/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ cd /terraform
# Fix URL to remove "v1" or "v1/"
export SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL%v1*}

# Support proxy for terraform
export HTTP_PROXY=${HTTP_PROXY:=""}
export HTTPS_PROXY=${HTTPS_PROXY:=""}

COLLECTOR_NAME={{- if .Values.sumologic.collectorName }}{{ .Values.sumologic.collectorName }}{{- else}}{{ .Values.sumologic.clusterName }}{{- end}}

terraform init
Expand Down
3 changes: 3 additions & 0 deletions deploy/helm/sumologic/templates/events-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ spec:
secretKeyRef:
name: sumologic
key: endpoint-events
{{- if .Values.fluentd.events.extraEnvVars }}
{{ toYaml .Values.fluentd.events.extraEnvVars | nindent 10 }}
{{- end }}
{{- if .Values.fluentd.persistence.enabled }}
volumeClaimTemplates:
- metadata:
Expand Down
4 changes: 4 additions & 0 deletions deploy/helm/sumologic/templates/setup/setup-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,9 @@ spec:
value: {{ required "A valid .Values.sumologic.accessKey entry required!" .Values.sumologic.accessKey }}
- name: SUMOLOGIC_BASE_URL
value: {{ .Values.sumologic.endpoint }}
- name: HTTP_PROXY
value: {{ .Values.sumologic.httpProxy }}
- name: HTTPS_PROXY
value: {{ .Values.sumologic.httpsProxy }}
{{ end }}
{{- end }}
12 changes: 12 additions & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ sumologic:
# ref: https://help.sumologic.com/APIs/General-API-Information/Sumo-Logic-Endpoints-and-Firewall-Security
endpoint: ""

# proxy urls
httpProxy: ""
httpsProxy: ""

# Collector name
#collectorName: ""

Expand Down Expand Up @@ -453,6 +457,14 @@ fluentd:
# pods: "v1"
# events: "events.k8s.io/v1beta1"

# Extra Environment Values - allows yaml definitions
extraEnvVars:
# - name: VALUE_FROM_SECRET
# valueFrom:
# secretKeyRef:
# name: secret_name
# key: secret_key

## Configure metrics-server
## ref: https://github.com/helm/charts/blob/master/stable/metrics-server/values.yaml
metrics-server:
Expand Down
1 change: 1 addition & 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 @@ -495,6 +495,7 @@ data:
data_type metrics
metric_data_format prometheus
disable_cookies true
proxy_uri ""

---
# Source: sumologic/templates/serviceaccount.yaml
Expand Down
8 changes: 8 additions & 0 deletions deploy/kubernetes/setup-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ data:
# Fix URL to remove "v1" or "v1/"
export SUMOLOGIC_BASE_URL=${SUMOLOGIC_BASE_URL%v1*}

# Support proxy for terraform
export HTTP_PROXY=${HTTP_PROXY:=""}
export HTTPS_PROXY=${HTTPS_PROXY:=""}

COLLECTOR_NAME=$COLLECTOR_NAME

terraform init
Expand Down Expand Up @@ -265,5 +269,9 @@ spec:
value: $SUMOLOGIC_ACCESSKEY
- name: SUMOLOGIC_BASE_URL
value:
- name: HTTP_PROXY
value:
- name: HTTPS_PROXY
value: