From 692b4412e479ccc347cab5c1d24626f1fe37acf6 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Wed, 12 Dec 2018 14:18:43 -0800 Subject: [PATCH 1/3] Add note around SELinux Prometheus deployment --- ee/ucp/admin/configure/collect-cluster-metrics.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/collect-cluster-metrics.md b/ee/ucp/admin/configure/collect-cluster-metrics.md index 760ac9f74c..220dcb9945 100644 --- a/ee/ucp/admin/configure/collect-cluster-metrics.md +++ b/ee/ucp/admin/configure/collect-cluster-metrics.md @@ -84,8 +84,12 @@ To deploy Prometheus on worker nodes in a cluster: $ kubectl label node 3a724a-1 ucp-metrics= node "test-3a724a-1" labeled ``` + + > **SELinux Prometheus Deployment** + > + > If you are using SELinux, you must label your `ucp-node-certs` directories properly on your worker nodes before you move the ucp-metrics workload to them. To run ucp-metrics on a worker node, update the `ucp-node-certs` label by running `sudo chcon -R system_u:object_r:container_file_t:s0 /var/lib/docker/volumes/ucp-node-certs/_data`. -4. Patch the ucp-metrics DaemonSet's nodeSelector using the same key and value used for the node label. This example shows the key “ucp-metrics” and the value “”. +4. Patch the ucp-metrics DaemonSet's nodeSelector using the same key and value used for the node label. This example shows the key "ucp-metrics" and the value "". ``` $ kubectl -n kube-system patch daemonset ucp-metrics --type json -p '[{"op": "replace", "path": "/spec/template/spec/nodeSelector", "value": {"ucp-metrics": ""}}]' From 72468af580b0d1798428cf0472927f90df12a03e Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Wed, 12 Dec 2018 14:49:44 -0800 Subject: [PATCH 2/3] Add applicable UCP versions for note --- ee/ucp/admin/configure/collect-cluster-metrics.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ee/ucp/admin/configure/collect-cluster-metrics.md b/ee/ucp/admin/configure/collect-cluster-metrics.md index 220dcb9945..5f019c501d 100644 --- a/ee/ucp/admin/configure/collect-cluster-metrics.md +++ b/ee/ucp/admin/configure/collect-cluster-metrics.md @@ -27,7 +27,7 @@ These are high-level aggregate metrics that typically combine technical, financi - Company or division-level application downtime - Aggregate resource utilization - Application resource demand growth -  + ## Application metrics ## These are metrics about domain of APM tools like AppDynamics or DynaTrace and provide metrics about the state or performance of the application itself. @@ -35,7 +35,9 @@ These are metrics about domain of APM tools like AppDynamics or DynaTrace and pr - Container platform metrics - Host infrastructure metrics -Docker EE 2.1 does not collect or expose application level metrics. The following are metrics Docker EE 2.1 collects, aggregates, and exposes: +Docker EE 2.1 does not collect or expose application level metrics. + +The following are metrics Docker EE 2.1 collects, aggregates, and exposes: ## Service state metrics ## @@ -44,7 +46,6 @@ These are metrics about the state of services running on the container platform. - Convergence of K8s deployments and Swarm services - Cluster load by number of services or containers or pods - ## Host infrastructure metrics ## These are metrics taken from te software & hardware infrastructure. @@ -54,7 +55,6 @@ These are metrics taken from te software & hardware infrastructure. - Storage I/O - disk I/O, IOPs, capacity - Operating System – file descriptors, open network connections, number of processes/threads - ## Container infrastructure system metrics ## These are application-level metrics derived from the container platform itself. @@ -85,7 +85,7 @@ To deploy Prometheus on worker nodes in a cluster: node "test-3a724a-1" labeled ``` - > **SELinux Prometheus Deployment** + > **SELinux Prometheus Deployment for UCP 3.1.0-3.1.2** > > If you are using SELinux, you must label your `ucp-node-certs` directories properly on your worker nodes before you move the ucp-metrics workload to them. To run ucp-metrics on a worker node, update the `ucp-node-certs` label by running `sudo chcon -R system_u:object_r:container_file_t:s0 /var/lib/docker/volumes/ucp-node-certs/_data`. From 4b569ff338379791546b72bd79597c2fd4698f68 Mon Sep 17 00:00:00 2001 From: Anne Henmi <41210220+ahh-docker@users.noreply.github.com> Date: Wed, 26 Dec 2018 09:38:15 -0700 Subject: [PATCH 3/3] Update collect-cluster-metrics.md --- ee/ucp/admin/configure/collect-cluster-metrics.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/configure/collect-cluster-metrics.md b/ee/ucp/admin/configure/collect-cluster-metrics.md index 5f019c501d..6f6fb85b56 100644 --- a/ee/ucp/admin/configure/collect-cluster-metrics.md +++ b/ee/ucp/admin/configure/collect-cluster-metrics.md @@ -85,7 +85,7 @@ To deploy Prometheus on worker nodes in a cluster: node "test-3a724a-1" labeled ``` - > **SELinux Prometheus Deployment for UCP 3.1.0-3.1.2** + > **SELinux Prometheus Deployment for UCP 3.1.0, 3.1.1, and 3.1.2** > > If you are using SELinux, you must label your `ucp-node-certs` directories properly on your worker nodes before you move the ucp-metrics workload to them. To run ucp-metrics on a worker node, update the `ucp-node-certs` label by running `sudo chcon -R system_u:object_r:container_file_t:s0 /var/lib/docker/volumes/ucp-node-certs/_data`.