Skip to content

Commit

Permalink
defaults promtail to 2.1.0 in install script (grafana#3321)
Browse files Browse the repository at this point in the history
Signed-off-by: Cyril Tovena <[email protected]>
  • Loading branch information
owen-d authored and cyriltovena committed Feb 15, 2021
1 parent 6ac3ffc commit 0dd3795
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tools/promtail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ INSTANCEURL="${3:-}"
NAMESPACE="${4:-default}"
CONTAINERROOT="${5:-/var/lib/docker}"
PARSER="${6:-- docker:}"
VERSION="${PROMTAIL_VERSION:-2.1.0}"

if [ -z "$INSTANCEID" -o -z "$APIKEY" -o -z "$INSTANCEURL" -o -z "$NAMESPACE" -o -z "$CONTAINERROOT" -o -z "$PARSER" ]; then
echo "usage: $0 <instanceId> <apiKey> <url> [<namespace>[<container_root_path>[<parser>]]]"
Expand Down Expand Up @@ -291,7 +292,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: grafana/promtail:latest
image: grafana/promtail:<version>
imagePullPolicy: Always
name: promtail
readinessProbe:
Expand Down Expand Up @@ -375,4 +376,5 @@ echo "$TEMPLATE" | sed \
-e "s#<instanceUrl>#${INSTANCEURL}#" \
-e "s#<namespace>#${NAMESPACE}#" \
-e "s#<container_root_path>#${CONTAINERROOT}#" \
-e "s#<parser>#${PARSER}#"
-e "s#<parser>#${PARSER}#" \
-e "s#<version>#${VERSION}#"

0 comments on commit 0dd3795

Please sign in to comment.