tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Merge pull request #695 from darko-poljak/SC2004

Browse source 
Fix SC2004
This commit is contained in:
Darko Poljak 2018-10-02 21:49:01 +02:00 committed by GitHub
commit d29534861b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cdist/conf/type/__install_partition_msdos_apply/gencode-remote
View file

@ -40,16 +40,16 @@ size_to_mb() {
case "$suffix" in case "$suffix" in
K|k) K|k)
size="$(( $number / 1024 ))" size="$(( number / 1024 ))"
;; ;;
M|m) M|m)
size="$number" size="$number"
;; ;;
G|g) G|g)
size="$(( $number * 1024 ))" size="$(( number * 1024 ))"
;; ;;
%) %)
size="$(( $available_size * $number / 100 ))" size="$(( available_size * number / 100 ))"
;; ;;
*) *)
size="-1" size="-1"
@ -108,7 +108,7 @@ for object in $objects; do
if [ "${minor}" -lt "5" ]; then if [ "${minor}" -lt "5" ]; then
# Primary partitions # Primary partitions
primary_count=$(( $primary_count + 1 )) primary_count=$(( primary_count + 1 ))
available_size=$available_device_size available_size=$available_device_size
else else
# Logical partitions # Logical partitions
@ -121,7 +121,7 @@ for object in $objects; do
available_size=0 available_size=0
else else
partition_size=$(size_to_mb "$size" "$available_size") partition_size=$(size_to_mb "$size" "$available_size")
available_size="$(( $available_size - $partition_size ))" available_size="$(( available_size - partition_size ))"
fi fi
if [ "${minor}" -lt "5" ]; then if [ "${minor}" -lt "5" ]; then

2
cdist/conf/type/__prometheus_alertmanager/manifest
View file

@ -48,7 +48,7 @@ __key_value alertmanager_fix_init_script --file /etc/init.d/prometheus-alertmana
##### CONFIGURE ############################################################# ##### CONFIGURE #############################################################
FLAGS="--storage.path $storage_path --data.retention $(($retention_days*24))h --web.listen-address [::]:9093" FLAGS="--storage.path $storage_path --data.retention $((retention_days*24))h --web.listen-address [::]:9093"
require="$require $require_pkg" \ require="$require $require_pkg" \
__key_value alertmanager_args --file /etc/default/prometheus-alertmanager \ __key_value alertmanager_args --file /etc/default/prometheus-alertmanager \

2
cdist/conf/type/__prometheus_server/manifest
View file

@ -45,7 +45,7 @@ require="$require $require_pkg" __directory "$storage_path" --owner prometheus -
##### CONFIGURE ############################################################# ##### CONFIGURE #############################################################
FLAGS="--storage.tsdb.path $storage_path --storage.tsdb.retention $(($retention_days*24))h --web.listen-address [::]:9090" FLAGS="--storage.tsdb.path $storage_path --storage.tsdb.retention $((retention_days*24))h --web.listen-address [::]:9090"
# TODO it would be neat to restart prometheus on change -- __key_value really should have an --onchange parameter # TODO it would be neat to restart prometheus on change -- __key_value really should have an --onchange parameter
require="$require $require_pkg" \ require="$require $require_pkg" \