Skip to content

Commit

Permalink
Merge pull request #10142 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-10107-to-release-3.11

[release-3.11] openshift-prometheus: remove deprecated prometheus stack install
  • Loading branch information
openshift-merge-robot committed Oct 16, 2018
2 parents 2892025 + aec9756 commit 3f09a82
Show file tree
Hide file tree
Showing 46 changed files with 10 additions and 27,199 deletions.
19 changes: 0 additions & 19 deletions inventory/hosts.example
Original file line number Diff line number Diff line change
Expand Up @@ -699,25 +699,6 @@ debug_level=2
# this value must be 1
#openshift_logging_es_cluster_size=1

# Prometheus deployment
#
# Currently prometheus deployment is disabled by default, enable it by setting this
#openshift_hosted_prometheus_deploy=true
#
# Prometheus storage config
# By default prometheus uses emptydir storage, if you want to persist you should
# configure it to use pvc storage type. Each volume must be ReadWriteOnce.
#openshift_prometheus_storage_type=emptydir
#openshift_prometheus_alertmanager_storage_type=emptydir
#openshift_prometheus_alertbuffer_storage_type=emptydir
# Use PVCs for persistence
#openshift_prometheus_storage_type=pvc
#openshift_prometheus_alertmanager_storage_type=pvc
#openshift_prometheus_alertbuffer_storage_type=pvc

# Grafana deployment, requires Prometheus
#openshift_hosted_grafana_deploy=true

# Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet')
# os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant'

Expand Down
25 changes: 0 additions & 25 deletions playbooks/cluster-operator/aws/components/openshift-prometheus.yml

This file was deleted.

8 changes: 0 additions & 8 deletions playbooks/common/private/components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
- import_playbook: ../../openshift-logging/private/config.yml
when: openshift_logging_install_logging | default(false) | bool

- import_playbook: ../../openshift-prometheus/private/config.yml
when: openshift_hosted_prometheus_deploy | default(false) | bool

- import_playbook: ../../openshift-grafana/private/config.yml
when:
- openshift_hosted_prometheus_deploy | default(false) | bool
- openshift_hosted_grafana_deploy | default(false) | bool

- import_playbook: ../../openshift-monitor-availability/private/config.yml
when: openshift_monitor_availability_install | default(false) | bool

Expand Down
8 changes: 0 additions & 8 deletions playbooks/openshift-grafana/config.yml

This file was deleted.

31 changes: 0 additions & 31 deletions playbooks/openshift-grafana/private/config.yml

This file was deleted.

1 change: 0 additions & 1 deletion playbooks/openshift-grafana/private/filter_plugins

This file was deleted.

1 change: 0 additions & 1 deletion playbooks/openshift-grafana/private/lookup_plugins

This file was deleted.

1 change: 0 additions & 1 deletion playbooks/openshift-grafana/private/roles

This file was deleted.

10 changes: 0 additions & 10 deletions playbooks/openshift-grafana/private/uninstall.yml

This file was deleted.

2 changes: 0 additions & 2 deletions playbooks/openshift-grafana/uninstall.yml

This file was deleted.

16 changes: 0 additions & 16 deletions playbooks/openshift-prometheus/OWNERS

This file was deleted.

9 changes: 0 additions & 9 deletions playbooks/openshift-prometheus/config.yml

This file was deleted.

31 changes: 0 additions & 31 deletions playbooks/openshift-prometheus/private/config.yml

This file was deleted.

1 change: 0 additions & 1 deletion playbooks/openshift-prometheus/private/roles

This file was deleted.

8 changes: 0 additions & 8 deletions playbooks/openshift-prometheus/private/uninstall.yml

This file was deleted.

2 changes: 0 additions & 2 deletions playbooks/openshift-prometheus/uninstall.yml

This file was deleted.

78 changes: 0 additions & 78 deletions roles/openshift_grafana/README.md

This file was deleted.

60 changes: 0 additions & 60 deletions roles/openshift_grafana/defaults/main.yaml

This file was deleted.

0 comments on commit 3f09a82

Please sign in to comment.