{"action":"created","comment":{"url":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments/58139684","id":58139684,"diff_hunk":"@@ -19,68 +19,87 @@ https://www.elastic.co/videos/introduction-to-the-elk-stack[ELK stack]. The EFK\n stack can be useful for viewing logs aggregated from hosts and applications,\n whether coming from multiple containers or even deleted pods.\n \n-Three components make up the EFK logging stack:\n+These components make up the EFK logging stack:\n \n * https://www.elastic.co/products/elasticsearch[Elasticsearch]: An object store where all logs are stored.\n * http://www.fluentd.org/architecture[Fluentd]: Gathers logs from nodes and feeds them to Elasticsearch.\n * https://www.elastic.co/guide/en/kibana/current/introduction.html[Kibana]: A web UI for Elasticsearch.\n+ifdef::openshift-origin[]\n+* https://www.elastic.co/guide/en/elasticsearch/client/curator/current/about.html[Curator]: Removes old logs from Elasticsearch.\n+endif::openshift-origin[]\n \n Once deployed in a cluster, the stack aggregates logs from all nodes and\n projects into Elasticsearch, and provides a Kibana UI to view any logs. Cluster\n administrators can view all logs, but application developers can only view logs\n-for the project the have permission to view.\n+for projects they have permission to view.\n \n [NOTE]\n ====\n link:../install_config/install/prerequisites.html#managing-docker-container-logs[Managing\n Docker Container Logs] discusses the use of `json-file` logging driver options\n-to manage container logs when they become full.\n+to manage container logs and prevent filling node disks.\n ====\n \n == Pre-deployment Configuration\n \n-Deploying the EFK stack requires:\n+The deployer for the EFK stack generates the objects necessary to\n+implement aggregated logging, including secrets for secure communication\n+within the cluster.\n \n+Before running the deployer, the following are required:\n+\n+* A router deployment for serving cluster-defined routes\n+* Sufficient volumes for Elasticsearch cluster storage (one per replica)\n+* A project, typically reserved just for this deployment\n * A *logging-deployer* secret\n * A *logging-deployer* service account with access to the secret and creation privileges\n-* Sufficient volumes for Elasticsearch cluster storage\n-* A router deployment for serving cluster-defined routes\n \n-The deployer generates the objects necessary for communication within the\n-cluster, and defines secrets and templates to implement aggregated logging.\n+Perform the following steps to prepare for deployment:\n \n-. Create a new project. Once implemented in a single project, the EFK stack will\n-collect logs for every project within your OpenShift cluster. The examples in\n-this topic use `logging` as an example project:\n+. Ensure that you have deployed a router for the cluster.\n+. Ensure that you have the necessary storage for Elasticsearch.\n+ifdef::openshift-enterprise[]\n+. Ansible-based installs should create the *_logging-deployer-template_*\n+template in the *_openshift_* project.\n+Otherwise you can create it with the following command: \n +\n ====\n ----\n-$ oadm new-project logging --node-selector label=value\n+$ oc create -n openshift -f /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml\n ----\n ====\n+endif::openshift-enterprise[]\n+ifdef::openshift-origin[]\n+. If your installation did not create templates in the `openshift` namespace, the\n+`logging-deployer-template` and `logging-deployer-account-template` templates","path":"install_config/aggregate_logging.adoc","position":68,"original_position":68,"commit_id":"058507b8449f72a8d369933f96290a1499da5a10","original_commit_id":"058507b8449f72a8d369933f96290a1499da5a10","user":{"login":"adellape","id":3442316,"avatar_url":"https://avatars.githubusercontent.com/u/3442316?v=3","gravatar_id":"","url":"https://api.github.com/users/adellape","html_url":"https://github.com/adellape","followers_url":"https://api.github.com/users/adellape/followers","following_url":"https://api.github.com/users/adellape/following{/other_user}","gists_url":"https://api.github.com/users/adellape/gists{/gist_id}","starred_url":"https://api.github.com/users/adellape/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adellape/subscriptions","organizations_url":"https://api.github.com/users/adellape/orgs","repos_url":"https://api.github.com/users/adellape/repos","events_url":"https://api.github.com/users/adellape/events{/privacy}","received_events_url":"https://api.github.com/users/adellape/received_events","type":"User","site_admin":false},"body":"`*` for these.","created_at":"2016-03-31T22:41:10Z","updated_at":"2016-03-31T22:41:10Z","html_url":"https://github.com/openshift/openshift-docs/pull/1844#discussion_r58139684","pull_request_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844","_links":{"self":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments/58139684"},"html":{"href":"https://github.com/openshift/openshift-docs/pull/1844#discussion_r58139684"},"pull_request":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844"}}},"pull_request":{"url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844","id":64684338,"html_url":"https://github.com/openshift/openshift-docs/pull/1844","diff_url":"https://github.com/openshift/openshift-docs/pull/1844.diff","patch_url":"https://github.com/openshift/openshift-docs/pull/1844.patch","issue_url":"https://api.github.com/repos/openshift/openshift-docs/issues/1844","number":1844,"state":"open","locked":false,"title":"aggregated logging docs fixes","user":{"login":"sosiouxme","id":29690,"avatar_url":"https://avatars.githubusercontent.com/u/29690?v=3","gravatar_id":"","url":"https://api.github.com/users/sosiouxme","html_url":"https://github.com/sosiouxme","followers_url":"https://api.github.com/users/sosiouxme/followers","following_url":"https://api.github.com/users/sosiouxme/following{/other_user}","gists_url":"https://api.github.com/users/sosiouxme/gists{/gist_id}","starred_url":"https://api.github.com/users/sosiouxme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sosiouxme/subscriptions","organizations_url":"https://api.github.com/users/sosiouxme/orgs","repos_url":"https://api.github.com/users/sosiouxme/repos","events_url":"https://api.github.com/users/sosiouxme/events{/privacy}","received_events_url":"https://api.github.com/users/sosiouxme/received_events","type":"User","site_admin":false},"body":"There are a number of mistakes that exist, and things that need clarifying (this hopefully addresses https://github.com/openshift/origin-aggregated-logging/issues/65 adequately).\r\n\r\nOrigin has a number of features that aren't available yet and mostly won't be until 3.3, so liberal usage of ifdef occurred.","created_at":"2016-03-30T19:37:41Z","updated_at":"2016-03-31T22:41:10Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bd20ff3b069be79546981f71de2655768b247ff2","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844/commits","review_comments_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844/comments","review_comment_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openshift/openshift-docs/issues/1844/comments","statuses_url":"https://api.github.com/repos/openshift/openshift-docs/statuses/058507b8449f72a8d369933f96290a1499da5a10","head":{"label":"sosiouxme:20160330-logging-fixes","ref":"20160330-logging-fixes","sha":"058507b8449f72a8d369933f96290a1499da5a10","user":{"login":"sosiouxme","id":29690,"avatar_url":"https://avatars.githubusercontent.com/u/29690?v=3","gravatar_id":"","url":"https://api.github.com/users/sosiouxme","html_url":"https://github.com/sosiouxme","followers_url":"https://api.github.com/users/sosiouxme/followers","following_url":"https://api.github.com/users/sosiouxme/following{/other_user}","gists_url":"https://api.github.com/users/sosiouxme/gists{/gist_id}","starred_url":"https://api.github.com/users/sosiouxme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sosiouxme/subscriptions","organizations_url":"https://api.github.com/users/sosiouxme/orgs","repos_url":"https://api.github.com/users/sosiouxme/repos","events_url":"https://api.github.com/users/sosiouxme/events{/privacy}","received_events_url":"https://api.github.com/users/sosiouxme/received_events","type":"User","site_admin":false},"repo":{"id":29356781,"name":"openshift-docs","full_name":"sosiouxme/openshift-docs","owner":{"login":"sosiouxme","id":29690,"avatar_url":"https://avatars.githubusercontent.com/u/29690?v=3","gravatar_id":"","url":"https://api.github.com/users/sosiouxme","html_url":"https://github.com/sosiouxme","followers_url":"https://api.github.com/users/sosiouxme/followers","following_url":"https://api.github.com/users/sosiouxme/following{/other_user}","gists_url":"https://api.github.com/users/sosiouxme/gists{/gist_id}","starred_url":"https://api.github.com/users/sosiouxme/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sosiouxme/subscriptions","organizations_url":"https://api.github.com/users/sosiouxme/orgs","repos_url":"https://api.github.com/users/sosiouxme/repos","events_url":"https://api.github.com/users/sosiouxme/events{/privacy}","received_events_url":"https://api.github.com/users/sosiouxme/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/sosiouxme/openshift-docs","description":"OpenShift Documentation","fork":true,"url":"https://api.github.com/repos/sosiouxme/openshift-docs","forks_url":"https://api.github.com/repos/sosiouxme/openshift-docs/forks","keys_url":"https://api.github.com/repos/sosiouxme/openshift-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/sosiouxme/openshift-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/sosiouxme/openshift-docs/teams","hooks_url":"https://api.github.com/repos/sosiouxme/openshift-docs/hooks","issue_events_url":"https://api.github.com/repos/sosiouxme/openshift-docs/issues/events{/number}","events_url":"https://api.github.com/repos/sosiouxme/openshift-docs/events","assignees_url":"https://api.github.com/repos/sosiouxme/openshift-docs/assignees{/user}","branches_url":"https://api.github.com/repos/sosiouxme/openshift-docs/branches{/branch}","tags_url":"https://api.github.com/repos/sosiouxme/openshift-docs/tags","blobs_url":"https://api.github.com/repos/sosiouxme/openshift-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/sosiouxme/openshift-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/sosiouxme/openshift-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/sosiouxme/openshift-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/sosiouxme/openshift-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/sosiouxme/openshift-docs/languages","stargazers_url":"https://api.github.com/repos/sosiouxme/openshift-docs/stargazers","contributors_url":"https://api.github.com/repos/sosiouxme/openshift-docs/contributors","subscribers_url":"https://api.github.com/repos/sosiouxme/openshift-docs/subscribers","subscription_url":"https://api.github.com/repos/sosiouxme/openshift-docs/subscription","commits_url":"https://api.github.com/repos/sosiouxme/openshift-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/sosiouxme/openshift-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/sosiouxme/openshift-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/sosiouxme/openshift-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/sosiouxme/openshift-docs/contents/{+path}","compare_url":"https://api.github.com/repos/sosiouxme/openshift-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/sosiouxme/openshift-docs/merges","archive_url":"https://api.github.com/repos/sosiouxme/openshift-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/sosiouxme/openshift-docs/downloads","issues_url":"https://api.github.com/repos/sosiouxme/openshift-docs/issues{/number}","pulls_url":"https://api.github.com/repos/sosiouxme/openshift-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/sosiouxme/openshift-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/sosiouxme/openshift-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/sosiouxme/openshift-docs/labels{/name}","releases_url":"https://api.github.com/repos/sosiouxme/openshift-docs/releases{/id}","deployments_url":"https://api.github.com/repos/sosiouxme/openshift-docs/deployments","created_at":"2015-01-16T16:26:37Z","updated_at":"2015-01-16T16:26:37Z","pushed_at":"2016-03-31T18:17:35Z","git_url":"git://github.com/sosiouxme/openshift-docs.git","ssh_url":"git@github.com:sosiouxme/openshift-docs.git","clone_url":"https://github.com/sosiouxme/openshift-docs.git","svn_url":"https://github.com/sosiouxme/openshift-docs","homepage":null,"size":8954,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"openshift:master","ref":"master","sha":"c800554af0ced20463c357157585216b12bf7d5c","user":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"repo":{"id":21740844,"name":"openshift-docs","full_name":"openshift/openshift-docs","owner":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openshift/openshift-docs","description":"OpenShift Documentation","fork":false,"url":"https://api.github.com/repos/openshift/openshift-docs","forks_url":"https://api.github.com/repos/openshift/openshift-docs/forks","keys_url":"https://api.github.com/repos/openshift/openshift-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openshift/openshift-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openshift/openshift-docs/teams","hooks_url":"https://api.github.com/repos/openshift/openshift-docs/hooks","issue_events_url":"https://api.github.com/repos/openshift/openshift-docs/issues/events{/number}","events_url":"https://api.github.com/repos/openshift/openshift-docs/events","assignees_url":"https://api.github.com/repos/openshift/openshift-docs/assignees{/user}","branches_url":"https://api.github.com/repos/openshift/openshift-docs/branches{/branch}","tags_url":"https://api.github.com/repos/openshift/openshift-docs/tags","blobs_url":"https://api.github.com/repos/openshift/openshift-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openshift/openshift-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openshift/openshift-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/openshift/openshift-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openshift/openshift-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/openshift/openshift-docs/languages","stargazers_url":"https://api.github.com/repos/openshift/openshift-docs/stargazers","contributors_url":"https://api.github.com/repos/openshift/openshift-docs/contributors","subscribers_url":"https://api.github.com/repos/openshift/openshift-docs/subscribers","subscription_url":"https://api.github.com/repos/openshift/openshift-docs/subscription","commits_url":"https://api.github.com/repos/openshift/openshift-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/openshift/openshift-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/openshift/openshift-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/openshift/openshift-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/openshift/openshift-docs/contents/{+path}","compare_url":"https://api.github.com/repos/openshift/openshift-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openshift/openshift-docs/merges","archive_url":"https://api.github.com/repos/openshift/openshift-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openshift/openshift-docs/downloads","issues_url":"https://api.github.com/repos/openshift/openshift-docs/issues{/number}","pulls_url":"https://api.github.com/repos/openshift/openshift-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/openshift/openshift-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/openshift/openshift-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openshift/openshift-docs/labels{/name}","releases_url":"https://api.github.com/repos/openshift/openshift-docs/releases{/id}","deployments_url":"https://api.github.com/repos/openshift/openshift-docs/deployments","created_at":"2014-07-11T15:14:42Z","updated_at":"2016-03-27T03:44:54Z","pushed_at":"2016-03-31T21:27:50Z","git_url":"git://github.com/openshift/openshift-docs.git","ssh_url":"git@github.com:openshift/openshift-docs.git","clone_url":"https://github.com/openshift/openshift-docs.git","svn_url":"https://github.com/openshift/openshift-docs","homepage":"https://docs.openshift.org/latest/welcome/index.html","size":13074,"stargazers_count":43,"watchers_count":43,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":195,"mirror_url":null,"open_issues_count":137,"forks":195,"open_issues":137,"watchers":43,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844"},"html":{"href":"https://github.com/openshift/openshift-docs/pull/1844"},"issue":{"href":"https://api.github.com/repos/openshift/openshift-docs/issues/1844"},"comments":{"href":"https://api.github.com/repos/openshift/openshift-docs/issues/1844/comments"},"review_comments":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844/comments"},"review_comment":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1844/commits"},"statuses":{"href":"https://api.github.com/repos/openshift/openshift-docs/statuses/058507b8449f72a8d369933f96290a1499da5a10"}}}}