{"action":"created","comment":{"url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/comments/84022740","pull_request_review_id":4825916,"id":84022740,"diff_hunk":"@@ -52,61 +50,68 @@ heka_{{ service_name }}_service_wrapper:\n   - source: salt://heka/files/service_wrapper\n   - user: root\n   - mode: 755\n+  - defaults:\n+    service_name: {{ service_name }}\n   - template: jinja\n \n {%- endif %}\n \n+heka_{{ service_name }}_service:\n+  service.running:\n+  - name: {{ service_name }}\n+  - enable: True\n \n {# Setup basic structure for all roles so updates can apply #}\n \n {%- set service_grains = {\n-  'heka': {\n-    'log_collector': {\n-      'decoder': {},\n-      'input': {},\n-      'filter': {},\n-      'splitter': {},\n-      'encoder': {},\n-      'output': {}\n-    },\n-    'metric_collector': {\n-      'decoder': {},\n-      'input': {},\n-      'filter': {},\n-      'splitter': {},\n-      'encoder': {},\n-      'output': {}\n-    },\n-    'remote_collector': {\n-      'decoder': {},\n-      'input': {},\n-      'filter': {},\n-      'splitter': {},\n-      'encoder': {},\n-      'output': {}\n-    },\n-    'aggregator': {\n-      'decoder': {},\n-      'input': {},\n-      'filter': {},\n-      'splitter': {},\n-      'encoder': {},\n-      'output': {}\n-    }\n+  'log_collector': {\n+    'decoder': {},\n+    'input': {},\n+    'filter': {},\n+    'splitter': {},\n+    'encoder': {},\n+    'output': {}\n+  },\n+  'metric_collector': {\n+    'decoder': {},\n+    'input': {},\n+    'filter': {},\n+    'splitter': {},\n+    'encoder': {},\n+    'output': {}\n+  },\n+  'remote_collector': {\n+    'decoder': {},\n+    'input': {},\n+    'filter': {},\n+    'splitter': {},\n+    'encoder': {},\n+    'output': {}\n+  },\n+  'aggregator': {\n+    'decoder': {},\n+    'input': {},\n+    'filter': {},\n+    'splitter': {},\n+    'encoder': {},\n+    'output': {}\n   }\n } %}\n \n \n+\n {# Loading the other services' support metadata for local roles #}\n \n {%- if service_name in ['log_collector', 'metric_collector'] %}\n \n {%- for service_name, service in pillar.iteritems() %}\n {%- if service.get('_support', {}).get('heka', {}).get('enabled', False) %}\n \n+{%- macro load_grains_file(grains_fragment_file) %}{% include grains_fragment_file %}{% endmacro %}","path":"heka/_service.sls","position":null,"original_position":112,"commit_id":"f74b96755b80f6dca7042116e074e0f26f5f5f18","original_commit_id":"f74b96755b80f6dca7042116e074e0f26f5f5f18","user":{"login":"elemoine","id":76594,"avatar_url":"https://avatars.githubusercontent.com/u/76594?v=3","gravatar_id":"","url":"https://api.github.com/users/elemoine","html_url":"https://github.com/elemoine","followers_url":"https://api.github.com/users/elemoine/followers","following_url":"https://api.github.com/users/elemoine/following{/other_user}","gists_url":"https://api.github.com/users/elemoine/gists{/gist_id}","starred_url":"https://api.github.com/users/elemoine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/elemoine/subscriptions","organizations_url":"https://api.github.com/users/elemoine/orgs","repos_url":"https://api.github.com/users/elemoine/repos","events_url":"https://api.github.com/users/elemoine/events{/privacy}","received_events_url":"https://api.github.com/users/elemoine/received_events","type":"User","site_admin":false},"body":"See https://github.com/tcpcloud/salt-formula-heka/pull/3 and https://github.com/tcpcloud/salt-formula-heka/pull/4.","created_at":"2016-10-19T08:45:10Z","updated_at":"2016-10-19T08:45:11Z","html_url":"https://github.com/tcpcloud/salt-formula-heka/pull/1#discussion_r84022740","pull_request_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1","_links":{"self":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/comments/84022740"},"html":{"href":"https://github.com/tcpcloud/salt-formula-heka/pull/1#discussion_r84022740"},"pull_request":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1"}}},"pull_request":{"url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1","id":88980360,"html_url":"https://github.com/tcpcloud/salt-formula-heka/pull/1","diff_url":"https://github.com/tcpcloud/salt-formula-heka/pull/1.diff","patch_url":"https://github.com/tcpcloud/salt-formula-heka/pull/1.patch","issue_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/1","number":1,"state":"open","locked":false,"title":"WIP: Stacklight integration","user":{"login":"cznewt","id":1389088,"avatar_url":"https://avatars.githubusercontent.com/u/1389088?v=3","gravatar_id":"","url":"https://api.github.com/users/cznewt","html_url":"https://github.com/cznewt","followers_url":"https://api.github.com/users/cznewt/followers","following_url":"https://api.github.com/users/cznewt/following{/other_user}","gists_url":"https://api.github.com/users/cznewt/gists{/gist_id}","starred_url":"https://api.github.com/users/cznewt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cznewt/subscriptions","organizations_url":"https://api.github.com/users/cznewt/orgs","repos_url":"https://api.github.com/users/cznewt/repos","events_url":"https://api.github.com/users/cznewt/events{/privacy}","received_events_url":"https://api.github.com/users/cznewt/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-10-12T09:18:34Z","updated_at":"2016-10-19T08:45:11Z","closed_at":null,"merged_at":null,"merge_commit_sha":"822fd86042d662f95e6450885f89c1903bb212d5","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1/commits","review_comments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1/comments","review_comment_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/comments{/number}","comments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/1/comments","statuses_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/statuses/f74b96755b80f6dca7042116e074e0f26f5f5f18","head":{"label":"tcpcloud:stacklight","ref":"stacklight","sha":"f74b96755b80f6dca7042116e074e0f26f5f5f18","user":{"login":"tcpcloud","id":8155954,"avatar_url":"https://avatars.githubusercontent.com/u/8155954?v=3","gravatar_id":"","url":"https://api.github.com/users/tcpcloud","html_url":"https://github.com/tcpcloud","followers_url":"https://api.github.com/users/tcpcloud/followers","following_url":"https://api.github.com/users/tcpcloud/following{/other_user}","gists_url":"https://api.github.com/users/tcpcloud/gists{/gist_id}","starred_url":"https://api.github.com/users/tcpcloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tcpcloud/subscriptions","organizations_url":"https://api.github.com/users/tcpcloud/orgs","repos_url":"https://api.github.com/users/tcpcloud/repos","events_url":"https://api.github.com/users/tcpcloud/events{/privacy}","received_events_url":"https://api.github.com/users/tcpcloud/received_events","type":"Organization","site_admin":false},"repo":{"id":43812591,"name":"salt-formula-heka","full_name":"tcpcloud/salt-formula-heka","owner":{"login":"tcpcloud","id":8155954,"avatar_url":"https://avatars.githubusercontent.com/u/8155954?v=3","gravatar_id":"","url":"https://api.github.com/users/tcpcloud","html_url":"https://github.com/tcpcloud","followers_url":"https://api.github.com/users/tcpcloud/followers","following_url":"https://api.github.com/users/tcpcloud/following{/other_user}","gists_url":"https://api.github.com/users/tcpcloud/gists{/gist_id}","starred_url":"https://api.github.com/users/tcpcloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tcpcloud/subscriptions","organizations_url":"https://api.github.com/users/tcpcloud/orgs","repos_url":"https://api.github.com/users/tcpcloud/repos","events_url":"https://api.github.com/users/tcpcloud/events{/privacy}","received_events_url":"https://api.github.com/users/tcpcloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tcpcloud/salt-formula-heka","description":null,"fork":false,"url":"https://api.github.com/repos/tcpcloud/salt-formula-heka","forks_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/forks","keys_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/teams","hooks_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/hooks","issue_events_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/events{/number}","events_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/events","assignees_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/assignees{/user}","branches_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/branches{/branch}","tags_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/tags","blobs_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/refs{/sha}","trees_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/statuses/{sha}","languages_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/languages","stargazers_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/stargazers","contributors_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/contributors","subscribers_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/subscribers","subscription_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/subscription","commits_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/commits{/sha}","git_commits_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/commits{/sha}","comments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/comments{/number}","issue_comment_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/comments{/number}","contents_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/contents/{+path}","compare_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/merges","archive_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/downloads","issues_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues{/number}","pulls_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls{/number}","milestones_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/milestones{/number}","notifications_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/labels{/name}","releases_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/releases{/id}","deployments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/deployments","created_at":"2015-10-07T12:01:53Z","updated_at":"2016-02-07T20:56:22Z","pushed_at":"2016-10-19T08:43:21Z","git_url":"git://github.com/tcpcloud/salt-formula-heka.git","ssh_url":"git@github.com:tcpcloud/salt-formula-heka.git","clone_url":"https://github.com/tcpcloud/salt-formula-heka.git","svn_url":"https://github.com/tcpcloud/salt-formula-heka","homepage":null,"size":234,"stargazers_count":1,"watchers_count":1,"language":"SaltStack","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":4,"forks":3,"open_issues":4,"watchers":1,"default_branch":"master"}},"base":{"label":"tcpcloud:master","ref":"master","sha":"41a41d43c5cc5960ae0930c9332b62bc0446b77d","user":{"login":"tcpcloud","id":8155954,"avatar_url":"https://avatars.githubusercontent.com/u/8155954?v=3","gravatar_id":"","url":"https://api.github.com/users/tcpcloud","html_url":"https://github.com/tcpcloud","followers_url":"https://api.github.com/users/tcpcloud/followers","following_url":"https://api.github.com/users/tcpcloud/following{/other_user}","gists_url":"https://api.github.com/users/tcpcloud/gists{/gist_id}","starred_url":"https://api.github.com/users/tcpcloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tcpcloud/subscriptions","organizations_url":"https://api.github.com/users/tcpcloud/orgs","repos_url":"https://api.github.com/users/tcpcloud/repos","events_url":"https://api.github.com/users/tcpcloud/events{/privacy}","received_events_url":"https://api.github.com/users/tcpcloud/received_events","type":"Organization","site_admin":false},"repo":{"id":43812591,"name":"salt-formula-heka","full_name":"tcpcloud/salt-formula-heka","owner":{"login":"tcpcloud","id":8155954,"avatar_url":"https://avatars.githubusercontent.com/u/8155954?v=3","gravatar_id":"","url":"https://api.github.com/users/tcpcloud","html_url":"https://github.com/tcpcloud","followers_url":"https://api.github.com/users/tcpcloud/followers","following_url":"https://api.github.com/users/tcpcloud/following{/other_user}","gists_url":"https://api.github.com/users/tcpcloud/gists{/gist_id}","starred_url":"https://api.github.com/users/tcpcloud/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tcpcloud/subscriptions","organizations_url":"https://api.github.com/users/tcpcloud/orgs","repos_url":"https://api.github.com/users/tcpcloud/repos","events_url":"https://api.github.com/users/tcpcloud/events{/privacy}","received_events_url":"https://api.github.com/users/tcpcloud/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tcpcloud/salt-formula-heka","description":null,"fork":false,"url":"https://api.github.com/repos/tcpcloud/salt-formula-heka","forks_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/forks","keys_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/teams","hooks_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/hooks","issue_events_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/events{/number}","events_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/events","assignees_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/assignees{/user}","branches_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/branches{/branch}","tags_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/tags","blobs_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/refs{/sha}","trees_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/statuses/{sha}","languages_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/languages","stargazers_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/stargazers","contributors_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/contributors","subscribers_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/subscribers","subscription_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/subscription","commits_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/commits{/sha}","git_commits_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/git/commits{/sha}","comments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/comments{/number}","issue_comment_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/comments{/number}","contents_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/contents/{+path}","compare_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/merges","archive_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/downloads","issues_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues{/number}","pulls_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls{/number}","milestones_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/milestones{/number}","notifications_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/labels{/name}","releases_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/releases{/id}","deployments_url":"https://api.github.com/repos/tcpcloud/salt-formula-heka/deployments","created_at":"2015-10-07T12:01:53Z","updated_at":"2016-02-07T20:56:22Z","pushed_at":"2016-10-19T08:43:21Z","git_url":"git://github.com/tcpcloud/salt-formula-heka.git","ssh_url":"git@github.com:tcpcloud/salt-formula-heka.git","clone_url":"https://github.com/tcpcloud/salt-formula-heka.git","svn_url":"https://github.com/tcpcloud/salt-formula-heka","homepage":null,"size":234,"stargazers_count":1,"watchers_count":1,"language":"SaltStack","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":3,"mirror_url":null,"open_issues_count":4,"forks":3,"open_issues":4,"watchers":1,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1"},"html":{"href":"https://github.com/tcpcloud/salt-formula-heka/pull/1"},"issue":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/1"},"comments":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/tcpcloud/salt-formula-heka/statuses/f74b96755b80f6dca7042116e074e0f26f5f5f18"}}}}
{"actor":{"display_login":"elemoine"}}