diff --git a/install_config/cluster_metrics.adoc b/install_config/cluster_metrics.adoc index 235423b42cdd..6c0b52b8c6d3 100644 --- a/install_config/cluster_metrics.adoc +++ b/install_config/cluster_metrics.adoc @@ -308,9 +308,9 @@ non-persistent data does come with the risk of permanent data loss. However, metrics can still survive a container being restarted. In order to use non-persistent storage, you must set the -`openshift_metrics_cassandra_storage_type` -xref:../install_config/cluster_metrics.adoc#metrics-ansible-variables[variable] -to `emptyDir` in the inventory file. +`*USE_PERSISTENT_STORAGE*` +xref:modifying-the-deployer-template[template +option] to `false` for the Metrics Deployer. [NOTE] ==== @@ -433,120 +433,6 @@ signed with the specified CA. By default, this is set to allow the add `system:master-proxy` to the list in order to allow xref:../dev_guide/pod_autoscaling.adoc#dev-guide-pod-autoscaling[horizontal pod autoscaling] to function properly. - -|`openshift_metrics_cassandra_storage_type` -|Use `emptyDir` for ephemeral storage (for testing); `pv` for persistent volumes, -which need to be created before the installation; or `dynamic` for dynamic -persistent volumes. - -|`openshift_metrics_cassandra_replicas` -|The number of Cassandra nodes for the metrics stack. This value dictates the -number of Cassandra replication controllers. - -|`openshift_metrics_cassandra_limits_memory` -|The memory limit for the Cassandra pod. For example, a value of `2Gi` would -limit Cassandra to 2 GB of memory. This value could be further adjusted by the -start script based on available memory of the node on which it is scheduled. - -|`openshift_metrics_cassandra_limits_cpu` -|The CPU limit for the Cassandra pod. For example, a value of `4000m` (4000 -millicores) would limit Cassandra to 4 CPUs. - -|`openshift_metrics_cassandra_replicas` -|The number of replicas for Cassandra. - -|`openshift_metrics_cassandra_requests_memory` -|The amount of memory to request for Cassandra pod. For example, a value of -`2Gi` would request 2 GB of memory. - -|`openshift_metrics_cassandra_requests_cpu` -|The CPU request for the Cassandra pod. For example, a value of `4000m` (4000 -millicores) would request 4 CPUs. - -|`openshift_metrics_cassandra_storage_group` -|The supplemental storage group to use for Cassandra. - -|`openshift_metrics_cassandra_nodeselector` -|Set to the desired, existing -xref:../admin_guide/scheduling/node_selector.adoc#admin-guide-sched-selector[node selector] to ensure that -pods are placed onto nodes with specific labels. For example, -`{"region":"infra"}`. - -|`openshift_metrics_hawkular_ca` -|An optional certificate authority (CA) file used to sign the Hawkular certificate. - -|`openshift_metrics_hawkular_cert` -|The certificate file used for re-encrypting the route to Hawkular metrics. The -certificate must contain the host name used by the route. If unspecified, the -default router certificate is used. - -|`openshift_metrics_hawkular_key` -|The key file used with the Hawkular certificate. - -|`openshift_metrics_hawkular_limits_memory` -|The amount of memory to limit the Hawkular pod. For example, a value of `2Gi` -would limit the Hawkular pod to 2 GB of memory. This value could be further -adjusted by the start script based on available memory of the node on which it -is scheduled. - -|`openshift_metrics_hawkular_limits_cpu` -|The CPU limit for the Hawkular pod. For example, a value of `4000m` (4000 -millicores) would limit the Hawkular pod to 4 CPUs. - -|`openshift_metrics_hawkular_replicas` -|The number of replicas for Hawkular metrics. - -|`openshift_metrics_hawkular_requests_memory` -|The amount of memory to request for the Hawkular pod. For example, a value of -`2Gi` would request 2 GB of memory. - -|`openshift_metrics_hawkular_requests_cpu` -|The CPU request for the Hawkular pod. For example, a value of `4000m` (4000 -millicores) would request 4 CPUs. - -|`openshift_metrics_hawkular_nodeselector` -|Set to the desired, existing -xref:../admin_guide/scheduling/node_selector.adoc#admin-guide-sched-selector[node selector] to ensure that -pods are placed onto nodes with specific labels. For example, -`{"region":"infra"}`. - -|`openshift_metrics_heapster_allowed_users` -|A comma-separated list of CN to accept. By default, this is set to allow the -OpenShift service proxy to connect. Add `system:master-proxy` to the list when -overriding in order to allow -xref:../dev_guide/pod_autoscaling.adoc#dev-guide-pod-autoscaling[horizontal pod -autoscaling] to function properly. - -|`openshift_metrics_heapster_limits_memory` -|The amount of memory to limit the Heapster pod. For example, a value of `2Gi` -would limit the Heapster pod to 2 GB of memory. - -|`openshift_metrics_heapster_limits_cpu` -|The CPU limit for the Heapster pod. For example, a value of `4000m` (4000 -millicores) would limit the Heapster pod to 4 CPUs. - -|`openshift_metrics_heapster_requests_memory` -|The amount of memory to request for Heapster pod. For example, a value of `2Gi` -would request 2 GB of memory. - -|`openshift_metrics_heapster_requests_cpu` -|The CPU request for the Heapster pod. For example, a value of `4000m` (4000 -millicores) would request 4 CPUs. - -|`openshift_metrics_heapster_standalone` -|Deploy only Heapster, without the Hawkular Metrics and Cassandra components. - -|`openshift_metrics_heapster_nodeselector` -|Set to the desired, existing -xref:../admin_guide/scheduling/node_selector.adoc#admin-guide-sched-selector[node selector] to ensure that -pods are placed onto nodes with specific labels. For example, -`{"region":"infra"}`. - -|`openshift_metrics_install_hawkular_agent` -|Set to `true` to install the Hawkular OpenShift Agent (HOSA). Set to `false` to -remove the HOSA from an installation. HOSA can be used to collect custom -metrics from your pods. This component is currently in -Technology Preview and is not installed by default. |=== [[modifying-the-deployer-template]]