Skip to content

Fix some linter warnings, part 7a #257

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

Merged
kornicameister merged 3 commits into from
Oct 19, 2017
Merged

Fix some linter warnings, part 7a #257

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
d812a24
Fix some linter warnings, part 7a
digitalfishpond Oct 18, 2017
23066d7
Fix some linter warnings, part 7a
digitalfishpond Oct 19, 2017
41ec20a
Merge branch 'master' into fix-lint-8a
digitalfishpond Oct 19, 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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ MON_AGENT_COLLECTOR_VERSION=master-20170811-222309
MON_LOG_METRICS_VERSION=latest
MON_LOG_PERSISTER_VERSION=latest
MON_LOG_TRANSFORMER_VERSION=latest
MON_ELASTICSEARCH_INIT_VERSION=latest
MON_ELASTICSEARCH_INIT_VERSION=0.0.2
MON_LOG_API_VERSION=master-20170821-224127
MON_KIBANA_VERSION=4.6.3-master

Expand Down
2 changes: 1 addition & 1 deletion elasticsearch-init/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repository: monasca/elasticsearch-init
variants:
- tag: 0.0.1
- tag: 0.0.2
aliases:
- :latest
3 changes: 2 additions & 1 deletion elasticsearch-init/upload.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
# shellcheck shell=dash

TPL_DIR=/templates

Expand All @@ -19,7 +20,7 @@ fi
for template in $TPLS; do

echo "Handling template file $template"
tpl_name=`_get_tpl_name_from_file "$template"`
tpl_name=$(_get_tpl_name_from_file "$template")

curl -XPUT --retry 2 --retry-delay 2 "$ELASTICSEARCH_URI"/_template/"${tpl_name}" -d @$TPL_DIR/"$template"

Expand Down