From b47254e65063065c9969cab88655031b180453cd Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Tue, 22 Sep 2020 10:31:12 -0700 Subject: [PATCH 1/7] expose link to prometheus pods for pod warning rancher/dashboard#1167 --- chart/monitoring/index.vue | 3 ++ chart/monitoring/prometheus/index.vue | 49 ++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/chart/monitoring/index.vue b/chart/monitoring/index.vue index a9197134f25..138ce80f90e 100644 --- a/chart/monitoring/index.vue +++ b/chart/monitoring/index.vue @@ -56,6 +56,7 @@ export default { }, ], pvcs: [], + prometheusPods: [], secrets: [], storageClasses: [], targetNamespace: null, @@ -125,6 +126,7 @@ export default { pod.spec.containers.find(p => p.image.includes('quay.io/coreos/prometheus-operator') || p.image.includes('rancher/coreos-prometheus-operator') ) ) { this.warnPrometheusInstalled = true; + this.prometheusPods.push(pod); } }); } @@ -162,6 +164,7 @@ export default { :mode="mode" :storage-classes="storageClasses" :warn-user="warnPrometheusInstalled" + :prometheus-pods="prometheusPods" />
diff --git a/chart/monitoring/prometheus/index.vue b/chart/monitoring/prometheus/index.vue index fdd37a951af..526af4b3550 100644 --- a/chart/monitoring/prometheus/index.vue +++ b/chart/monitoring/prometheus/index.vue @@ -1,10 +1,13 @@ @@ -84,13 +140,13 @@ export default {
-
- +
+
- +
@@ -99,6 +155,13 @@ export default {
+
+ + + +
From e45ce96175e66373bff316946b06fb6266b4f2c8 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Tue, 22 Sep 2020 16:21:41 -0700 Subject: [PATCH 3/7] remove tooltips for links out on mon overview https://github.com/rancher/dashboard/issues/1064#issuecomment-693104014 --- assets/translations/en-us.yaml | 37 ++++++++++++--------------- pages/c/_cluster/monitoring/index.vue | 7 +---- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml index 0ce0a956eb3..fdc6ba216f8 100644 --- a/assets/translations/en-us.yaml +++ b/assets/translations/en-us.yaml @@ -155,27 +155,27 @@ backupRestoreOperator: label: Prune tip: Delete all resources that match the ResourceSet used, but are not present in the backup. (Recommended) encryption: Encryption - encryptionConfigName: + encryptionConfigName: label: Encryption Config Secret tip: If the backup was performed with encryption enabled, a Secret containing the same encryption-provider-config should be used during restore. options: none: Store the contents of the backup unencrypted secret: Encrypt backups using an Encryption Config Secret (Recommended) - deleteTimeout: + deleteTimeout: label: Delete Timeout tip: Seconds to wait for a resource delete to succeed before removing finalizers to force deletion. resourceSetName: Resource Set - schedule: + schedule: label: Schedule placeholder: e.g. @midnight or 0 0 * * * - options: + options: disabled: One-Time Backup enabled: Recurring Backups restoreFrom: existing: An existing backup config default: The default storage target s3: An S3-compatible object store - retentionCount: + retentionCount: label: Retention Count units: |- {count, plural, @@ -586,7 +586,7 @@ istio: customOverlayFile: label: Custom Overlay File tip: 'The overlay file allows for additional configuration on top of the base Rancher Istio installation. You can utilize the IstioOperator API to make changes and additions for all components and apply those changes via this overlay YAML file.' - description: 'Rancher Istio helm chart installs a minimal Istio configuration for you to get started integrating with your applications. + description: 'Rancher Istio helm chart installs a minimal Istio configuration for you to get started integrating with your applications. If you would like to get additional information about Istio, visit https://istio.io/latest/docs/concepts/what-is-istio/' egressGateway: Enabled Egress Gateway ingressGateway: Enabled Ingress Gateway @@ -623,7 +623,7 @@ logging: indexName: Index Name user: User password: Password - caFile: + caFile: label: Certificate Authority File clientCert: label: Client Cert @@ -740,20 +740,15 @@ monitoring: subtitle: "Powered By: Prometheus" linkedList: alertManager: - label: 'AlertManager' - tooltip: 'View Active Alerts' + label: 'AlertManager - Active Alerts' grafana: - label: 'Grafana' - tooltip: 'View Metrics Dashboards' + label: 'Grafana - Metrics Dashboards' prometheusPromQl: - label: 'Prometheus PromQL Graph' - tooltip: 'View PromQL Graph' + label: 'Prometheus - PromQL Graph' prometheusRules: - label: 'Prometheus Rules' - tooltip: 'View Configured Rules' + label: 'Prometheus - Configured Rules' prometheusTargets: - label: 'Prometheus Targets' - tooltip: 'View Configured Targets' + label: 'Prometheus - Configured Targets' warning: Monitoring V1 is currently deployed. If you are migrating from an older version of Rancher with Monitoring enabled, please disable Monitoring on this cluster completely before attempting to install the new Rancher Monitoring chart. prometheus: config: @@ -1383,7 +1378,7 @@ workload: parallelism: label: Parallelism tip: The maximum number of pods the job should run at any given time. - startingDeadlineSeconds: + startingDeadlineSeconds: label: Starting Deadline Seconds tip: The deadline in seconds for starting the job if it misses scheduled time successfulJobsHistoryLimit: @@ -1561,8 +1556,8 @@ workload: volumeName: Volume Name volumePath: Volume Path typeDescriptions: - apps.daemonset: DaemonSets run exactly one pod on every eligible node. When new nodes are added to the cluster, DaemonSets automatically deploy to them. Recommended for system-wide or vertically-scalable workloads that never need more than one pod per node. More Info - apps.deployment: Deployments run a scalable number of replicas of a pod distributed among the eligible nodes. Changes are rolled out incrementally and can be rolled back to the previous revision when needed. Recommended for stateless & horizontally-scalable workloads. More Info + apps.daemonset: DaemonSets run exactly one pod on every eligible node. When new nodes are added to the cluster, DaemonSets automatically deploy to them. Recommended for system-wide or vertically-scalable workloads that never need more than one pod per node. More Info + apps.deployment: Deployments run a scalable number of replicas of a pod distributed among the eligible nodes. Changes are rolled out incrementally and can be rolled back to the previous revision when needed. Recommended for stateless & horizontally-scalable workloads. More Info apps.statefulset: StatefulSets manage stateful applications and provide guarantees about the ordering and uniqueness of the pods created. Recommended for workloads with persistent storage or strict identity, quorum, or upgrade order requirements. More Info batch.cronjob: CronJobs create Jobs, which then run Pods, on a repeating schedule. The schedule is expressed in standard Unix cron format, and uses the timezone of the Kubernetes control plane (typically UTC). More Info batch.job: Jobs create one or more pods to reliably perform a one-time task by running a pod until it exits successfully. Failed pods are automatically replaced until the specified number of completed runs has been reached. Jobs can also run multiple pods in parallel or function as a batch work queue. More Info @@ -1654,7 +1649,7 @@ typeDescription: # Map of # type: Description to be shown on the top of list view describing the type. # Should fit on one line. - # If you link to anything external, it must have + # If you link to anything external, it must have # target="_blank" rel="noopener noreferrer nofollow" cis.cattle.io.clusterscanbenchmark: A benchmark version is the name of benchmark to run using kube-bench as well as the valid configuration parameters for that benchmark. cis.cattle.io.clusterscanprofile: A profile is the configuration for the CIS scan, which is the benchmark versions to use and any specific tests to skip in that benchmark. diff --git a/pages/c/_cluster/monitoring/index.vue b/pages/c/_cluster/monitoring/index.vue index c6a686fb441..f75b5cc6449 100644 --- a/pages/c/_cluster/monitoring/index.vue +++ b/pages/c/_cluster/monitoring/index.vue @@ -58,7 +58,6 @@ export default { iconSrc: this.prometheusSrc, label: 'monitoring.overview.linkedList.alertManager.label', link: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-alertmanager:9093/proxy`, - tooltip: 'monitoring.overview.linkedList.alertManager.tooltip', }, { enabled: false, @@ -66,7 +65,6 @@ export default { iconSrc: this.grafanaSrc, label: 'monitoring.overview.linkedList.grafana.label', link: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy`, - tooltip: 'monitoring.overview.linkedList.grafana.tooltip', }, { enabled: false, @@ -74,7 +72,6 @@ export default { iconSrc: this.prometheusSrc, label: 'monitoring.overview.linkedList.prometheusPromQl.label', link: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/graph`, - tooltip: 'monitoring.overview.linkedList.prometheusPromQl.tooltip', }, { enabled: false, @@ -82,7 +79,6 @@ export default { iconSrc: this.prometheusSrc, label: 'monitoring.overview.linkedList.prometheusRules.label', link: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/rules`, - tooltip: 'monitoring.overview.linkedList.prometheusRules.tooltip', }, { enabled: false, @@ -90,7 +86,6 @@ export default { iconSrc: this.prometheusSrc, label: 'monitoring.overview.linkedList.prometheusTargets.label', link: `/k8s/clusters/${ this.currentCluster.id }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/targets`, - tooltip: 'monitoring.overview.linkedList.prometheusTargets.tooltip', }, ]; @@ -141,7 +136,7 @@ export default {
- + From 75953fd89332a8799c24c86a15075f67484b5d26 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Tue, 22 Sep 2020 17:07:10 -0700 Subject: [PATCH 4/7] Do not process always add for array types create yaml rancher/dashboard#1008 --- utils/create-yaml.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/create-yaml.js b/utils/create-yaml.js index 28049a95b95..aed3b8024f4 100644 --- a/utils/create-yaml.js +++ b/utils/create-yaml.js @@ -216,7 +216,7 @@ export function createYaml(schemas, type, data, processAlwaysAdd = true, depth = if ( SIMPLE_TYPES.includes(arrayOf) ) { out += `\n# - ${ arrayOf }`; } else { - const chunk = createYaml(schemas, arrayOf, null, processAlwaysAdd, depth + 1, (path ? `${ path }.${ key }` : key)); + const chunk = createYaml(schemas, arrayOf, null, false, depth + 1, (path ? `${ path }.${ key }` : key)); let indented = indent(chunk, 2); indented = indented.replace(/^(#)?\s*\s\s([^\s])/, '$1 - $2'); From 55bf204d071b73a758155e1bc3fa7cd9a57e607c Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Wed, 23 Sep 2020 12:12:16 -0700 Subject: [PATCH 5/7] monitoring config swap pods for workloads per pr feedback --- chart/monitoring/index.vue | 30 +++++++--------- chart/monitoring/prometheus/index.vue | 52 ++++++++++++++++++++++----- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/chart/monitoring/index.vue b/chart/monitoring/index.vue index 138ce80f90e..899d9271cd3 100644 --- a/chart/monitoring/index.vue +++ b/chart/monitoring/index.vue @@ -9,7 +9,7 @@ import Grafana from '@/chart/monitoring/grafana'; import Prometheus from '@/chart/monitoring/prometheus'; import { allHash } from '@/utils/promise'; -import { STORAGE_CLASS, PVC, SECRET, POD } from '@/config/types'; +import { STORAGE_CLASS, PVC, SECRET, WORKLOAD_TYPES } from '@/config/types'; export default { components: { @@ -56,14 +56,19 @@ export default { }, ], pvcs: [], - prometheusPods: [], + prometheusResources: [], secrets: [], storageClasses: [], targetNamespace: null, - warnPrometheusInstalled: false, }; }, + computed: { + workloads() { + return Object.values(WORKLOAD_TYPES).flatMap(type => this.$store.getters['cluster/all'](type)); + }, + }, + created() { if (this.mode === 'create') { const extendedDefaults = { @@ -99,12 +104,13 @@ export default { const { $store } = this; const hash = await allHash({ namespaces: $store.getters['namespaces'](), - pods: $store.dispatch('cluster/findAll', { type: POD }), pvcs: $store.dispatch('cluster/findAll', { type: PVC }), secrets: $store.dispatch('cluster/findAll', { type: SECRET }), storageClasses: $store.dispatch('cluster/findAll', { type: STORAGE_CLASS }), }); + await Promise.all(Object.values(WORKLOAD_TYPES).map(type => this.$store.dispatch('cluster/findAll', { type }))); + this.targetNamespace = hash.namespaces[this.chart.targetNamespace] || false; if (!isEmpty(hash.storageClasses)) { @@ -118,18 +124,6 @@ export default { if (!isEmpty(hash.secrets)) { this.secrets = hash.secrets; } - - if (!isEmpty(hash.pods)) { - hash.pods.find((pod) => { - if ( - !isEmpty(pod.spec?.containers) && - pod.spec.containers.find(p => p.image.includes('quay.io/coreos/prometheus-operator') || p.image.includes('rancher/coreos-prometheus-operator') ) - ) { - this.warnPrometheusInstalled = true; - this.prometheusPods.push(pod); - } - }); - } }, }, }; @@ -163,8 +157,8 @@ export default { :access-modes="accessModes" :mode="mode" :storage-classes="storageClasses" - :warn-user="warnPrometheusInstalled" - :prometheus-pods="prometheusPods" + :prometheus-pods="prometheusResources" + :workloads="workloads" />
diff --git a/chart/monitoring/prometheus/index.vue b/chart/monitoring/prometheus/index.vue index 526af4b3550..9c626275110 100644 --- a/chart/monitoring/prometheus/index.vue +++ b/chart/monitoring/prometheus/index.vue @@ -1,4 +1,5 @@