diff --git a/bundles/grafana/items.py b/bundles/grafana/items.py index 365f307..13a0c7b 100644 --- a/bundles/grafana/items.py +++ b/bundles/grafana/items.py @@ -11,28 +11,25 @@ for row in Path(join(repo.path, 'bundles', 'grafana', 'dashboard-rows')).rglob(" exec(f.read()) directories = { + # Don't ask me why these permissions are that weird. It's what the + # debian package sets them to after upgrades. '/etc/grafana/provisioning/dashboards': { - 'owner': 'grafana', 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/datasources': { - 'owner': 'grafana', 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/notifiers': { - 'owner': 'grafana', 'group': 'grafana', 'purge': True, }, '/etc/grafana/provisioning/plugins': { - 'owner': 'grafana', 'group': 'grafana', 'purge': True, }, '/var/lib/grafana/dashboards': { - 'owner': 'grafana', 'group': 'grafana', 'purge': True, 'triggers': { @@ -129,6 +126,8 @@ for rnode in repo.nodes: dashboard['tags'].add('zfs') files[f'/var/lib/grafana/dashboards/{rnode.name}.json'] = { + 'owner': 'grafana', + 'group': 'grafana', # use metadata_to_json, because this supports sets 'content': metadata_to_json(dashboard), 'triggers': {