Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cluster up: add option to install logging components #11343

Merged
merged 1 commit into from
Oct 19, 2016

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Oct 12, 2016

Adds --logging flag to cluster up to install log aggregation components

@csrwng
Copy link
Contributor Author

csrwng commented Oct 12, 2016

@jim-minter @bparees ptal
@sosiouxme @jcantrill fyi

loggingDeployerTemplate = "logging-deployer-template"
)

func instantiateTemplate(client client.Interface, mapper configcmd.Mapper, templateNamespace, templateName, targetNamespace string, params map[string]string) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we already have one of these for the jenkins admission controller, can we not reuse it/move it to a helper utility location?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bparees so I looked into merging this code with the one from the admission controller, but there's very little that we can actually share. Basically we could share the call to the bulk create. However, even then, you have a custom After handler in that code that is not necessarily what I want in this case.

https://github.com/openshift/origin/blob/master/pkg/build/admission/jenkinsbootstrapper/admission.go#L112

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@bparees
Copy link
Contributor

bparees commented Oct 12, 2016

I think you need @jcantrill's sign off more than mine.

@csrwng csrwng force-pushed the clusterup_logging branch from d44a9fd to 5ecdba0 Compare October 12, 2016 19:53
@stevekuznetsov
Copy link
Contributor

I had understood the executive direction of deploying logging to be an Ansible playbook -- do we really want to maintain this as well?

@stevekuznetsov
Copy link
Contributor

/cc @smarterclayton

@csrwng
Copy link
Contributor Author

csrwng commented Oct 12, 2016

@stevekuznetsov so yes, for now ... ideally the deployer pod would do an Ansible install

@csrwng csrwng force-pushed the clusterup_logging branch from 5ecdba0 to 9ea3449 Compare October 12, 2016 20:11
@@ -38,6 +38,7 @@ const (

var (
openShiftContainerBinds = []string{
"/var/log:/var/log:rw",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of interest, why is this being added?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For aggregated logging to work, fluentd relies on the node to write symlinks in /var/log/containers that serve as metadata to the actual container logs. Without mounting /var/log the containerized node would be writing symlinks to its container filesystem where fluentd can't read them.

if c.ShouldInstallLogging && c.ShouldInitializeData() {
loggingInfo = fmt.Sprintf("The kibana logging UI is available at:\n"+
" https://%s\n\n", openshift.LoggingHost(c.RoutingSuffix, c.ServerIP))
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(As much a note to self as anything): this info should probably go into oc cluster status as well - see whether this PR beats #11171 or not!

@smarterclayton
Copy link
Contributor

This is installing the single system setup for logging to enable someone to run with it on in a semi-realistic way.

@jcantrill
Copy link
Contributor

@stevekuznetsov This is the short term fix to 'oc cluster up' providing a logging stack for someone to experience logging. In future, once ansible is availabe and packaged nicely in an image, this would need to be reworked to consume that change.

@jcantrill
Copy link
Contributor

My only comment is regarding the template. I don't know how much it has changed over the lifetime of logging but unfortunate it will need to be refreshed here when it changes. May be less of an issue once we are able to rely on ansible. Otherwise LGTM

@csrwng
Copy link
Contributor Author

csrwng commented Oct 14, 2016

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 9ea3449

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10069/) (Base Commit: d942e98)

@csrwng
Copy link
Contributor Author

csrwng commented Oct 18, 2016

[merge]

@csrwng
Copy link
Contributor Author

csrwng commented Oct 19, 2016

#11094
[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Oct 19, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10069/) (Image: devenv-rhel7_5206)

@csrwng
Copy link
Contributor Author

csrwng commented Oct 19, 2016

#9203
[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 9ea3449

@openshift-bot openshift-bot merged commit 39dd519 into openshift:master Oct 19, 2016
@csrwng csrwng deleted the clusterup_logging branch December 21, 2016 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants