{"action":"created","comment":{"url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/comments/26600509","id":26600509,"diff_hunk":"@@ -1,11 +1,21 @@\n+{%- from \"collectd/map.jinja\" import collectd_settings with context %}\n+{%- set df_settings = collectd_settings.plugins.df -%}\n+\n+#\n+# DO NOT EDIT\n+#\n+# This file is managed by salt via {{ source }}\n+# Modify the config that generates this file instead\n+#\n+\n LoadPlugin df\n \n <Plugin df>\n-      {{ 'Device \"{}\"'.format(Device) if Device else '' }}\n-      {{ 'MountPoint \"{}\"'.format(MountPoint) if MountPoint else '' }}\n-      {{ 'FSType \"{}\"'.format(FSType) if FSType else '' }}\n-      IgnoreSelected {{ IgnoreSelected }}\n-      ReportByDevice {{ ReportByDevice }}\n-      ReportReserved {{ ReportReserved }}\n-      ReportInodes {{ ReportInodes }}\n+      Device \"{{ df_settings.Device }}\"\n+      MountPoint \"{{ df_settings.MountPoint }}\"\n+      FSType \"{{ df_settings.FSType }}\"","path":"collectd/files/df.conf","position":23,"original_position":23,"commit_id":"694432092dd4f74fd1ccfc8cd1289943a69bc57d","original_commit_id":"694432092dd4f74fd1ccfc8cd1289943a69bc57d","user":{"login":"nmadhok","id":3374962,"avatar_url":"https://avatars.githubusercontent.com/u/3374962?v=3","gravatar_id":"","url":"https://api.github.com/users/nmadhok","html_url":"https://github.com/nmadhok","followers_url":"https://api.github.com/users/nmadhok/followers","following_url":"https://api.github.com/users/nmadhok/following{/other_user}","gists_url":"https://api.github.com/users/nmadhok/gists{/gist_id}","starred_url":"https://api.github.com/users/nmadhok/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nmadhok/subscriptions","organizations_url":"https://api.github.com/users/nmadhok/orgs","repos_url":"https://api.github.com/users/nmadhok/repos","events_url":"https://api.github.com/users/nmadhok/events{/privacy}","received_events_url":"https://api.github.com/users/nmadhok/received_events","type":"User","site_admin":false},"body":"I agree","created_at":"2015-03-17T18:18:53Z","updated_at":"2015-03-17T18:18:53Z","html_url":"https://github.com/saltstack-formulas/collectd-formula/pull/25#discussion_r26600509","pull_request_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25","_links":{"self":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/comments/26600509"},"html":{"href":"https://github.com/saltstack-formulas/collectd-formula/pull/25#discussion_r26600509"},"pull_request":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25"}}},"pull_request":{"url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25","id":31251833,"html_url":"https://github.com/saltstack-formulas/collectd-formula/pull/25","diff_url":"https://github.com/saltstack-formulas/collectd-formula/pull/25.diff","patch_url":"https://github.com/saltstack-formulas/collectd-formula/pull/25.patch","issue_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/25","number":25,"state":"open","locked":false,"title":"Switch to standard formula style","user":{"login":"babilen","id":117961,"avatar_url":"https://avatars.githubusercontent.com/u/117961?v=3","gravatar_id":"","url":"https://api.github.com/users/babilen","html_url":"https://github.com/babilen","followers_url":"https://api.github.com/users/babilen/followers","following_url":"https://api.github.com/users/babilen/following{/other_user}","gists_url":"https://api.github.com/users/babilen/gists{/gist_id}","starred_url":"https://api.github.com/users/babilen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/babilen/subscriptions","organizations_url":"https://api.github.com/users/babilen/orgs","repos_url":"https://api.github.com/users/babilen/repos","events_url":"https://api.github.com/users/babilen/events{/privacy}","received_events_url":"https://api.github.com/users/babilen/received_events","type":"User","site_admin":false},"body":"    As recently discussed on salt-formulas it is preferred to keep settings (both\r\n    distribution specific ones and defaults for pillar data) in map.jinja and rely\r\n    on deep merging. This commit switches the formula to that style and thereby\r\n    provides a single way to access *all* settings via the collect_settings\r\n    dictionary.\r\n    \r\n    Pillar backwards compatibility was mostly kept, but it was necessary to adjust\r\n    both the mysql and postgresql pillars to contain lists of dictionaries, rather\r\n    than simply defining a single db over which the previous code then \"iterated\".\r\n    \r\n    Unfortunately it was also necessary to remove some symlink settings from the\r\n    java plugin that is both unnecessary on, at least, Debian family minions and\r\n    suffered from ill-defined defaults.","created_at":"2015-03-16T15:10:25Z","updated_at":"2015-03-17T18:18:53Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5b617c09d1736018ba5cff00f609bbf4179fe426","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25/commits","review_comments_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25/comments","review_comment_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/comments{/number}","comments_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/25/comments","statuses_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/statuses/694432092dd4f74fd1ccfc8cd1289943a69bc57d","head":{"label":"babilen:template-structure","ref":"template-structure","sha":"694432092dd4f74fd1ccfc8cd1289943a69bc57d","user":{"login":"babilen","id":117961,"avatar_url":"https://avatars.githubusercontent.com/u/117961?v=3","gravatar_id":"","url":"https://api.github.com/users/babilen","html_url":"https://github.com/babilen","followers_url":"https://api.github.com/users/babilen/followers","following_url":"https://api.github.com/users/babilen/following{/other_user}","gists_url":"https://api.github.com/users/babilen/gists{/gist_id}","starred_url":"https://api.github.com/users/babilen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/babilen/subscriptions","organizations_url":"https://api.github.com/users/babilen/orgs","repos_url":"https://api.github.com/users/babilen/repos","events_url":"https://api.github.com/users/babilen/events{/privacy}","received_events_url":"https://api.github.com/users/babilen/received_events","type":"User","site_admin":false},"repo":{"id":31645120,"name":"collectd-formula","full_name":"babilen/collectd-formula","owner":{"login":"babilen","id":117961,"avatar_url":"https://avatars.githubusercontent.com/u/117961?v=3","gravatar_id":"","url":"https://api.github.com/users/babilen","html_url":"https://github.com/babilen","followers_url":"https://api.github.com/users/babilen/followers","following_url":"https://api.github.com/users/babilen/following{/other_user}","gists_url":"https://api.github.com/users/babilen/gists{/gist_id}","starred_url":"https://api.github.com/users/babilen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/babilen/subscriptions","organizations_url":"https://api.github.com/users/babilen/orgs","repos_url":"https://api.github.com/users/babilen/repos","events_url":"https://api.github.com/users/babilen/events{/privacy}","received_events_url":"https://api.github.com/users/babilen/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/babilen/collectd-formula","description":null,"fork":true,"url":"https://api.github.com/repos/babilen/collectd-formula","forks_url":"https://api.github.com/repos/babilen/collectd-formula/forks","keys_url":"https://api.github.com/repos/babilen/collectd-formula/keys{/key_id}","collaborators_url":"https://api.github.com/repos/babilen/collectd-formula/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/babilen/collectd-formula/teams","hooks_url":"https://api.github.com/repos/babilen/collectd-formula/hooks","issue_events_url":"https://api.github.com/repos/babilen/collectd-formula/issues/events{/number}","events_url":"https://api.github.com/repos/babilen/collectd-formula/events","assignees_url":"https://api.github.com/repos/babilen/collectd-formula/assignees{/user}","branches_url":"https://api.github.com/repos/babilen/collectd-formula/branches{/branch}","tags_url":"https://api.github.com/repos/babilen/collectd-formula/tags","blobs_url":"https://api.github.com/repos/babilen/collectd-formula/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/babilen/collectd-formula/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/babilen/collectd-formula/git/refs{/sha}","trees_url":"https://api.github.com/repos/babilen/collectd-formula/git/trees{/sha}","statuses_url":"https://api.github.com/repos/babilen/collectd-formula/statuses/{sha}","languages_url":"https://api.github.com/repos/babilen/collectd-formula/languages","stargazers_url":"https://api.github.com/repos/babilen/collectd-formula/stargazers","contributors_url":"https://api.github.com/repos/babilen/collectd-formula/contributors","subscribers_url":"https://api.github.com/repos/babilen/collectd-formula/subscribers","subscription_url":"https://api.github.com/repos/babilen/collectd-formula/subscription","commits_url":"https://api.github.com/repos/babilen/collectd-formula/commits{/sha}","git_commits_url":"https://api.github.com/repos/babilen/collectd-formula/git/commits{/sha}","comments_url":"https://api.github.com/repos/babilen/collectd-formula/comments{/number}","issue_comment_url":"https://api.github.com/repos/babilen/collectd-formula/issues/comments{/number}","contents_url":"https://api.github.com/repos/babilen/collectd-formula/contents/{+path}","compare_url":"https://api.github.com/repos/babilen/collectd-formula/compare/{base}...{head}","merges_url":"https://api.github.com/repos/babilen/collectd-formula/merges","archive_url":"https://api.github.com/repos/babilen/collectd-formula/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/babilen/collectd-formula/downloads","issues_url":"https://api.github.com/repos/babilen/collectd-formula/issues{/number}","pulls_url":"https://api.github.com/repos/babilen/collectd-formula/pulls{/number}","milestones_url":"https://api.github.com/repos/babilen/collectd-formula/milestones{/number}","notifications_url":"https://api.github.com/repos/babilen/collectd-formula/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/babilen/collectd-formula/labels{/name}","releases_url":"https://api.github.com/repos/babilen/collectd-formula/releases{/id}","created_at":"2015-03-04T07:57:42Z","updated_at":"2015-03-04T07:57:42Z","pushed_at":"2015-03-16T15:09:34Z","git_url":"git://github.com/babilen/collectd-formula.git","ssh_url":"git@github.com:babilen/collectd-formula.git","clone_url":"https://github.com/babilen/collectd-formula.git","svn_url":"https://github.com/babilen/collectd-formula","homepage":"http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html","size":158,"stargazers_count":0,"watchers_count":0,"language":"ApacheConf","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"saltstack-formulas:master","ref":"master","sha":"cad25be0eabbab9c11bae1f4af71fdde442ea0a8","user":{"login":"saltstack-formulas","id":4683350,"avatar_url":"https://avatars.githubusercontent.com/u/4683350?v=3","gravatar_id":"","url":"https://api.github.com/users/saltstack-formulas","html_url":"https://github.com/saltstack-formulas","followers_url":"https://api.github.com/users/saltstack-formulas/followers","following_url":"https://api.github.com/users/saltstack-formulas/following{/other_user}","gists_url":"https://api.github.com/users/saltstack-formulas/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack-formulas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack-formulas/subscriptions","organizations_url":"https://api.github.com/users/saltstack-formulas/orgs","repos_url":"https://api.github.com/users/saltstack-formulas/repos","events_url":"https://api.github.com/users/saltstack-formulas/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack-formulas/received_events","type":"Organization","site_admin":false},"repo":{"id":23077805,"name":"collectd-formula","full_name":"saltstack-formulas/collectd-formula","owner":{"login":"saltstack-formulas","id":4683350,"avatar_url":"https://avatars.githubusercontent.com/u/4683350?v=3","gravatar_id":"","url":"https://api.github.com/users/saltstack-formulas","html_url":"https://github.com/saltstack-formulas","followers_url":"https://api.github.com/users/saltstack-formulas/followers","following_url":"https://api.github.com/users/saltstack-formulas/following{/other_user}","gists_url":"https://api.github.com/users/saltstack-formulas/gists{/gist_id}","starred_url":"https://api.github.com/users/saltstack-formulas/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/saltstack-formulas/subscriptions","organizations_url":"https://api.github.com/users/saltstack-formulas/orgs","repos_url":"https://api.github.com/users/saltstack-formulas/repos","events_url":"https://api.github.com/users/saltstack-formulas/events{/privacy}","received_events_url":"https://api.github.com/users/saltstack-formulas/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/saltstack-formulas/collectd-formula","description":null,"fork":false,"url":"https://api.github.com/repos/saltstack-formulas/collectd-formula","forks_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/forks","keys_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/keys{/key_id}","collaborators_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/teams","hooks_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/hooks","issue_events_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/events{/number}","events_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/events","assignees_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/assignees{/user}","branches_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/branches{/branch}","tags_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/tags","blobs_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/git/refs{/sha}","trees_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/git/trees{/sha}","statuses_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/statuses/{sha}","languages_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/languages","stargazers_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/stargazers","contributors_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/contributors","subscribers_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/subscribers","subscription_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/subscription","commits_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/commits{/sha}","git_commits_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/git/commits{/sha}","comments_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/comments{/number}","issue_comment_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/comments{/number}","contents_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/contents/{+path}","compare_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/compare/{base}...{head}","merges_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/merges","archive_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/downloads","issues_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues{/number}","pulls_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls{/number}","milestones_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/milestones{/number}","notifications_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/labels{/name}","releases_url":"https://api.github.com/repos/saltstack-formulas/collectd-formula/releases{/id}","created_at":"2014-08-18T16:09:47Z","updated_at":"2015-03-04T13:03:53Z","pushed_at":"2015-03-04T13:03:53Z","git_url":"git://github.com/saltstack-formulas/collectd-formula.git","ssh_url":"git@github.com:saltstack-formulas/collectd-formula.git","clone_url":"https://github.com/saltstack-formulas/collectd-formula.git","svn_url":"https://github.com/saltstack-formulas/collectd-formula","homepage":"http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html","size":329,"stargazers_count":3,"watchers_count":3,"language":"ApacheConf","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":14,"mirror_url":null,"open_issues_count":2,"forks":14,"open_issues":2,"watchers":3,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25"},"html":{"href":"https://github.com/saltstack-formulas/collectd-formula/pull/25"},"issue":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/25"},"comments":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/issues/25/comments"},"review_comments":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25/comments"},"review_comment":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/pulls/25/commits"},"statuses":{"href":"https://api.github.com/repos/saltstack-formulas/collectd-formula/statuses/694432092dd4f74fd1ccfc8cd1289943a69bc57d"}}}}