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

Mount correct env vars to scalyr logging agent #727

Merged
merged 3 commits into from
Dec 6, 2017
Merged

Mount correct env vars to scalyr logging agent #727

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef2559e
fix: mount env vars to init container as well
linki Dec 5, 2017
c8f2cad
fix: expand env var and mount to log-watcher as well
linki Dec 5, 2017
2f9fb01
fix: use latest version of log-watcher
linki Dec 6, 2017
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
19 changes: 16 additions & 3 deletions cluster/manifests/logging-agent/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ spec:
args:
- |
SCALYR_CONFIG_PATH="/mnt/scalyr/agent.json"
IMPORT_VARS="WATCHER_SCALYR_API_KEY WATCHER_CLUSTER_ID"
IMPORT_VARS="WATCHER_SCALYR_API_KEY WATCHER_CLUSTER_ID WATCHER_SCALYR_SERVER"
if [ ! -f $SCALYR_CONFIG_PATH ]; then
echo '{
"import_vars": ["WATCHER_SCALYR_API_KEY", "WATCHER_CLUSTER_ID"],
"import_vars": ["WATCHER_SCALYR_API_KEY", "WATCHER_CLUSTER_ID", "WATCHER_SCALYR_SERVER"],
"server_attributes": {"serverHost": "$WATCHER_CLUSTER_ID"},
"implicit_agent_process_metrics_monitor": false,
"implicit_metric_monitor": false,
Expand All @@ -57,14 +57,25 @@ spec:
echo 'Updated agent.json to inital configuration';
fi && cat $SCALYR_CONFIG_PATH;
test -f /mnt/scalyr-checkpoint/checkpoints.json && ls -lah /mnt/scalyr-checkpoint/checkpoints.json && cat /mnt/scalyr-checkpoint/checkpoints.json || true;
env:
- name: WATCHER_SCALYR_API_KEY
valueFrom:
secretKeyRef:
name: logging-agent
key: scalyr-access-key
- name: WATCHER_CLUSTER_ID
value: "{{ .ID }}"
- name: WATCHER_SCALYR_SERVER
value: "{{ index .ConfigItems "scalyr_server" }}"

volumeMounts:
- name: scalyr-config
mountPath: /mnt/scalyr
- name: scalyr-checkpoint
mountPath: /mnt/scalyr-checkpoint
containers:
- name: log-watcher
image: registry.opensource.zalan.do/eagleeye/kubernetes-log-watcher:0.15
image: registry.opensource.zalan.do/eagleeye/kubernetes-log-watcher:0.17
env:
- name: CLUSTER_NODE_NAME
valueFrom:
Expand All @@ -78,6 +89,8 @@ spec:
secretKeyRef:
name: logging-agent
key: scalyr-access-key
- name: WATCHER_SCALYR_SERVER
value: "{{ index .ConfigItems "scalyr_server" }}"
- name: WATCHER_CLUSTER_ID
value: "{{ .ID }}"
- name: WATCHER_SCALYR_DEST_PATH
Expand Down