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

Change events deployment readiness probe #360

Merged
merged 3 commits into from
Jan 10, 2020
Merged

Change events deployment readiness probe #360

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
26c4587
add http source in events.conf for new readiness/liveness probe
vsinghal13 Jan 10, 2020
ccf3d71
change probes in events deployment
vsinghal13 Jan 10, 2020
26d6794
Generate new 'fluentd-sumologic.yaml.tmpl'
Jan 10, 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
5 changes: 5 additions & 0 deletions deploy/helm/sumologic/conf/events/events.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
<source>
@type prometheus_output_monitor
</source>
<source>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hah this was what I was asking about at standup

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I guess I misunderstood at that time.

@type http
port 9880
bind 0.0.0.0
</source>
<match kubernetes.**>
@type sumologic
@id sumologic.endpoint.events
Expand Down
19 changes: 8 additions & 11 deletions deploy/helm/sumologic/templates/events-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,16 @@ spec:
- name: pos-files
mountPath: /mnt/pos/
livenessProbe:
exec:
command:
- "/bin/sh"
- "-c"
- "[ $(pgrep ruby | wc -l) -gt 0 ]"
httpGet:
path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
port: 9880
initialDelaySeconds: 300
periodSeconds: 20
periodSeconds: 30
timeoutSeconds: 3
readinessProbe:
exec:
command:
- "/bin/sh"
- "-c"
- "[ $(pgrep ruby | wc -l) -gt 0 ]"
httpGet:
path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
port: 9880
initialDelaySeconds: 30
periodSeconds: 5
env:
Expand Down
24 changes: 13 additions & 11 deletions deploy/kubernetes/fluentd-sumologic.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ data:
<source>
@type prometheus_output_monitor
</source>
<source>
@type http
port 9880
bind 0.0.0.0
</source>
<match kubernetes.**>
@type sumologic
@id sumologic.endpoint.events
Expand Down Expand Up @@ -633,19 +638,16 @@ spec:
- name: pos-files
mountPath: /mnt/pos/
livenessProbe:
exec:
command:
- "/bin/sh"
- "-c"
- "[ $(pgrep ruby | wc -l) -gt 0 ]"
httpGet:
path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
port: 9880
initialDelaySeconds: 300
periodSeconds: 20
periodSeconds: 30
timeoutSeconds: 3
readinessProbe:
exec:
command:
- "/bin/sh"
- "-c"
- "[ $(pgrep ruby | wc -l) -gt 0 ]"
httpGet:
path: /fluentd.pod.healthcheck?json=%7B%22log%22%3A+%22health+check%22%7D
port: 9880
initialDelaySeconds: 30
periodSeconds: 5
env:
Expand Down