valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #44235 from xavierog/fix-grafana4-datasource-2017.7

Browse Source 
grafana4: datasource: handle missing keys in datasource description.
This commit is contained in:
Mike Place 2017-10-24 03:51:09 -06:00 committed by GitHub
commit a97f1c87e0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/grafana4_datasource.py
View File

@ -151,6 +151,12 @@ def present(name,
ret['changes'] = data ret['changes'] = data
return ret return ret
# At this stage, the datasource exists; however, the object provided by
# Grafana may lack some null keys compared to our "data" dict:
for key in data:
if key not in datasource:
datasource[key] = None
if data == datasource: if data == datasource:
ret['changes'] = None ret['changes'] = None
ret['comment'] = 'Data source {0} already up-to-date'.format(name) ret['comment'] = 'Data source {0} already up-to-date'.format(name)