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

Unify cluster-monitoring install variables #9727

Merged

Conversation

brancz
Copy link
Contributor

@brancz brancz commented Aug 23, 2018

Closes https://bugzilla.redhat.com/show_bug.cgi?id=1619505

Cluster monitoring is intended to be installed by default starting with 3.11, this PR unifies the previously two variables to control installing cluster-monitoring to one called openshift_cluster_monitoring_operator_install, and sets it by default to true.

Let me know if this is the idiomatic way to do it.

cc @sdodson @vrutkovs @smarterclayton

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 23, 2018
@vrutkovs
Copy link
Member

Lets also add an entry to hosts.example so that it would be more visible

@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 23, 2018
@brancz
Copy link
Contributor Author

brancz commented Aug 23, 2018

@vrutkovs great point. I added a commit describing how to disable it as well as the variables that are intended to be used by users. Let me know what you think.

# to run components of cluster-monitoring on and the configuration to use for
# the Prometheus Alertmanager.
#
# openshift_cluster_monitoring_operator_prometheus_storage_capacity: "50Gi"
Copy link
Member

Choose a reason for hiding this comment

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

These should be in INI format, so openshift_cluster_monitoring_operator_prometheus_storage_capacity="50Gi"

The switch to YAML is planned, but we'll take care of it

# openshift_cluster_monitoring_operator_prometheus_storage_capacity: "50Gi"
# openshift_cluster_monitoring_operator_alertmanager_storage_capacity: "2Gi"
# openshift_cluster_monitoring_operator_node_selector: "{{ openshift_hosted_infra_selector | default('node-role.kubernetes.io/infra=true') | map_from_pairs }}"
# openshift_cluster_monitoring_operator_alertmanager_config: |+
Copy link
Member

Choose a reason for hiding this comment

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

This probably should be dropped - its too complex to rewrite in INI format and probably should go to openshift-docs instead

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 23, 2018
@brancz
Copy link
Contributor Author

brancz commented Aug 23, 2018

@vrutkovs updated. PTAL.

@sichvoge
Copy link

Does this PR add deploying the monitoring stack by default only for upgrades or does it also work when running the deploy_cluster playbook or any first OCP installations?

I traced back the playbooks a little bit and only saw that this being run when upgrading to 3.11. The cluster monitoring stack should always be installed with upgrades to 3.11, but also when installing a complete new 3.11 OCP cluster. Just want to make sure that it is covered as well.

@vrutkovs ^

@vrutkovs
Copy link
Member

vrutkovs commented Aug 24, 2018

@sichvoge Good point, currently it would only install monitoring on upgrades only

Copy link
Member

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

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

Please update boolean in playbooks/common/private/components.yml to have it deployed by default on new installs

@brancz
Copy link
Contributor Author

brancz commented Aug 25, 2018

Thanks for letting me know where to add that I was under the impression this is the only place, still trying to find my way around this repo. Will update!

@brancz
Copy link
Contributor Author

brancz commented Aug 27, 2018

Updated. Please have another look @vrutkovs @sdodson.

@sdodson
Copy link
Member

sdodson commented Aug 27, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brancz, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 27, 2018
@openshift-merge-robot openshift-merge-robot merged commit 53f0d01 into openshift:master Aug 27, 2018
@brancz brancz deleted the unify-cluster-mon-vars branch August 27, 2018 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants