sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Support stretch + ascii in __grafana_dashboard

Browse source
This commit is contained in:
Nico Schottelius 2018-03-06 20:52:55 +01:00
parent bc94c01c49
commit bfe8b8fa57
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cdist/conf/type/__grafana_dashboard/manifest
View file

@ -21,6 +21,22 @@ case $os in
require="__apt_source/grafana __package/apt-transport-https" __package grafana require="__apt_source/grafana __package/apt-transport-https" __package grafana
require="__package/grafana" __start_on_boot grafana-server require="__package/grafana" __start_on_boot grafana-server
;; ;;
9*|ascii/ceres)
__apt_key_uri grafana \
--name 'Grafana Release Signing Key' \
--uri https://packagecloud.io/gpg.key
require="__apt_key_uri/grafana" __apt_source grafana \
--uri https://packagecloud.io/grafana/stable/debian/ \
--distribution stretch \
--component main
__package apt-transport-https
require="__apt_source/grafana __package/apt-transport-https" __package grafana
require="__package/grafana" __start_on_boot grafana-server
;;
*) *)
echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!"
exit 1 exit 1

1
docs/changelog
View file

@ -15,6 +15,7 @@ next:
* Core: Support in-distribution config file (Darko Poljak) * Core: Support in-distribution config file (Darko Poljak)
* New type: __apt_default_release (Matthijs Kooijman) * New type: __apt_default_release (Matthijs Kooijman)
* Type __file: Add pre-exists state (Matthijs Kooijman) * Type __file: Add pre-exists state (Matthijs Kooijman)
* Type __grafana_dashboard: Add support for stretch + ascii (Nico Schottelius)
4.8.0: 2018-02-14 4.8.0: 2018-02-14
* Core: Skip empty lines in parameter files (Darko Poljak) * Core: Skip empty lines in parameter files (Darko Poljak)