Commit Graph

87 Commits (5e6cfe0671d1442533aa70208d1c2d89117da716)

Author SHA1 Message Date
Arvind Iyengar 5e6cfe0671
(dev-v2.6-archive) Replace rancher/busybox w/ rancher/library-busybox
Related Issue: https://github.com/rancher/rancher/issues/28978

(partially cherry picked from commit c263e58157)
2022-01-06 11:33:14 -08:00
Arvind Iyengar b8cec21d48
(dev-v2.6-archive) Rebase to new upstream at kube-prometheus-stack
The old upstream at https://github.com/helm/charts/tree/master/stable/prometheus-operator has been deprecated in favor of the chart at https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack.

This commit modifies the rancher-monitoring patch in order to rebase to this new upstream, so it contains a ton of different changes to the patch file.

Related Issue: rancher/rancher#28822

(partially cherry picked from commit 178528b12c)
2022-01-06 11:33:13 -08:00
Arvind Iyengar 970d5e7246
(dev-v2.6-archive) Create Alertmanager secret in pre-install hook
(partially cherry picked from commit d03ffe81df)
2022-01-06 11:33:08 -08:00
Arvind Iyengar ef6896d23d
(dev-v2.6-archive) Update docs, descriptions, and other minor fixes
- [rancher-pushprox] add hidden annotation + update description
- [rancher-monitoring] update description + add monitoring app-README.md
- [rancher-monitoring|rancher-pushprox] Move systemDefaultRegistry to global.cattle
- [rancher-monitoring] Move exporter enabled logic to _helpers.tpl

(partially cherry picked from commit 4d5653b2ec)
2022-01-06 11:33:06 -08:00
Steven Crespo 5fbdeaedb4
(dev-v2.6-archive) Merge pull request #616 from PennyScissors/update-gatekeeper-v3.1.0
Update opa gatekeeper to v3.1.0

(partially cherry picked from commit 81c286cb9f)
2022-01-06 11:33:03 -08:00
Steven Crespo 7c9064ca09
(dev-v2.6-archive) Update opa gatekeeper to v3.1.0
(partially cherry picked from commit fb8c308737)
2022-01-06 11:33:02 -08:00
Brenda Rearden ac8e1a52cd
(dev-v2.6-archive) Merge pull request #627 from brendarearden/istio-version-rollback
Add annotation changes to version Istio 1.6.8

(partially cherry picked from commit 1322150a57)
2022-01-06 11:33:02 -08:00
Brenda Rearden 759d9a2f35
(dev-v2.6-archive) Add annotation changes to version Istio 1.6.8
(partially cherry picked from commit 583b669a92)
2022-01-06 11:33:01 -08:00
aiyengar2 47f53fb0ab
(dev-v2.6-archive) Merge pull request #595 from aiyengar2/change_crd_ownership
Add generateCRDChart.assumeOwnershipOfCRDs flag

(partially cherry picked from commit 7d32212d2c)
2022-01-06 11:33:00 -08:00
Prachi Damle 3a84d26ed3
(dev-v2.6-archive) Adding rancher-cis-benchmark-crds - CRD chart for CIS v2
Adding rancher-cis-benchmark - Main chart for deploying cis-operator

Review comments and changes CRDs and adding the roles

Adding default ClusterScanProfiles in a Configmap

Updating kubernetes version to have major.minor.patch

Package the CRDs within the original chart and add package.yaml

chart changes for tolerations, crds, added
global.cattle.systemDefaultRegistry

Review changes to removed nodeSelector helper, combine all cis clusterroles in one file

CRD name change and adding keywords, moving package.yaml one folder upi
Renamed hardened benchmark
Move providesGVR to chart.yaml

(partially cherry picked from commit b55e6ec019)
2022-01-06 11:32:59 -08:00
Arvind Iyengar 60bbba3221
(dev-v2.6-archive) Use assumeOwnershipOfCRDs for rancher-monitoring
(partially cherry picked from commit 9fe6ed19c1)
2022-01-06 11:32:59 -08:00
Brenda Rearden 40ab3830d6
(dev-v2.6-archive) Add providesGVR to patch file and remove from package.yaml
(partially cherry picked from commit da849a2dee)
2022-01-06 11:32:58 -08:00
Caleb Bron 8d769b2a5b
(dev-v2.6-archive) Make monitoring gvr singular
(partially cherry picked from commit f223cb6b6d)
2022-01-06 11:32:57 -08:00
Brenda Rearden 6fbadc5687
(dev-v2.6-archive) Update provides/requires gvr, added keywords
(partially cherry picked from commit aa13a90e13)
2022-01-06 11:32:57 -08:00
Arvind Iyengar 97c85e9597
(dev-v2.6-archive) Use Rancher mirror for jettech/kube-webhook-certgen
(partially cherry picked from commit 30aa33a5b1)
2022-01-06 11:32:55 -08:00
Caleb Bron 146a4d2bf0
(dev-v2.6-archive) update how we manage dependency annotations
(partially cherry picked from commit 92211af12a)
2022-01-06 11:32:55 -08:00
Arvind Iyengar bc85f45531
(dev-v2.6-archive) Use Rancher images for monitoring subcharts
(partially cherry picked from commit 1b0deff7a9)
2022-01-06 11:32:54 -08:00
Arvind Iyengar 079f3c0c0c
(dev-v2.6-archive) Add private registry to monitoring subcharts
(partially cherry picked from commit bd24317ee8)
2022-01-06 11:32:54 -08:00
Arvind Iyengar 43f504d503
(dev-v2.6-archive) Use fixed versions for subcharts of rancher-monitoring
(partially cherry picked from commit 43efb64f82)
2022-01-06 11:32:53 -08:00
Arvind Iyengar 7e2065bc4d
(dev-v2.6-archive) fix typos in alerting config
(partially cherry picked from commit 3b6f47638d)
2022-01-06 11:32:53 -08:00
aiyengar2 5b05df23a9
(dev-v2.6-archive) Merge pull request #599 from aiyengar2/update_default_alerting_template
Update default Alerting template for defaults set in UI

(partially cherry picked from commit 5825928eac)
2022-01-06 11:32:50 -08:00
Darren Shepherd b96368994d
(dev-v2.6-archive) Fleet v0.3.0-alpha5
(partially cherry picked from commit d3a7562fda)
2022-01-06 11:32:48 -08:00
Arvind Iyengar 25f1d860c0
(dev-v2.6-archive) Update default Alerting template
(partially cherry picked from commit 6bc9f8c45f)
2022-01-06 11:32:48 -08:00
Arvind Iyengar 5d7ce13351
(dev-v2.6-archive) Rearrange patch
This commit is required due to patch flip-flops that will occur till https://github.com/rancher/rancher/issues/28627 is resolved.

(partially cherry picked from commit 267b8afc95)
2022-01-06 11:32:47 -08:00
Caleb Bron 54dcb1a2ef
(dev-v2.6-archive) Merge pull request #544 from MonzElmasry/rke2-monitoring
rke2-monitoring

(partially cherry picked from commit a8748de0f4)
2022-01-06 11:32:46 -08:00
Brenda Rearden 5fc81128ca
(dev-v2.6-archive) Merge pull request #577 from brendarearden/kiali-fixes
Update kiali image conventions, remove release.name from naming convention

(partially cherry picked from commit 95800e5bd0)
2022-01-06 11:32:45 -08:00
Brenda Rearden 036a7bef97
(dev-v2.6-archive) Remove release name, refactor image values, update web_root
(partially cherry picked from commit 5da19fc4a4)
2022-01-06 11:32:45 -08:00
Menna 2f3f12fa4c
(dev-v2.6-archive) add rke2proxy toleration
(partially cherry picked from commit 7c63442e79)
2022-01-06 11:32:44 -08:00
Menna f28495743d
(dev-v2.6-archive) Adds support for monitoring the following k8s components in rke2 clusters:
- `rke2-scheduler`
- `rke2-controller-manager`
- `rke2-proxy`
- `rke2-etcd`

All exporters are created from the cattle-pushprox chart. This commit
also modifies the relevant Grafana Dashboard ConfigMaps and
PrometheusRules to deploy if the PushProx exporters are enabled.

See changes to `overlay/CHANGELOG.md` for details on what has been added/modified.

(partially cherry picked from commit e5dfdc5c88)
2022-01-06 11:32:44 -08:00
Arvind Iyengar 200aba0f0e
(dev-v2.6-archive) Use Rancher images for rancher-monitoring
(partially cherry picked from commit e0d3e6519b)
2022-01-06 11:32:43 -08:00
Arvind Iyengar 261ea5234f
(dev-v2.6-archive) Add private registry support to rancher-monitoring
(partially cherry picked from commit aa30c498ea)
2022-01-06 11:32:42 -08:00
Arvind Iyengar c5b386d2e8
(dev-v2.6-archive) Add alerting support to rancher-monitoring
(partially cherry picked from commit d085bc088f)
2022-01-06 11:32:39 -08:00
Arvind Iyengar 77be6b1378
(dev-v2.6-archive) Change default to all CRs in all namespaces
This commit sets the following field to false:
`<serviceMonitor|podMonitor|rule>SelectorNilUsesHelmValues: true`

As a result, we look for all CRs with any labels in all namespaces rather than just
the ones tagged with `release: rancher-monitoring`.

(partially cherry picked from commit d2bf307e59)
2022-01-06 11:32:30 -08:00
Arvind Iyengar 1167f62350
(dev-v2.6-archive) Update grafana default deploymentStrategy
If the Grafana deployment strategy is not Recreate, the deployment will
be stuck during an upgrade when PV is attached.

(partially cherry picked from commit f3aebdca14)
2022-01-06 11:32:30 -08:00
Arvind Iyengar 99cb52dac7
(dev-v2.6-archive) Add NoExecute + NoSchedule toleration to PushProx
This commit adds NoExecute / NoSchedule tolerations by default to all of the
PushProx exporters since the default expectation when deploying these exporters
is that they are deployed on the expected nodes based on nodeSelector labels
regardless of any taints added to those nodes.

Users can always choose to override these settings if necessary.

(partially cherry picked from commit 215cf10a68)
2022-01-06 11:32:29 -08:00
Arvind Iyengar bf8675697f
(dev-v2.6-archive) Increase prometheus resource limits and requests
(partially cherry picked from commit de6fbbb129)
2022-01-06 11:32:29 -08:00
Arvind Iyengar 54f6d00110
(dev-v2.6-archive) Move ClusterRoles and change values.yaml fields
- Moves `monitoringRole` settings into `global.rbac` in values.yaml
- Moves user ClusterRoles into one file: `rancher-monitoring/clusterroles.yaml`
- Reformats user ClusterRoles format to look like upstream format
- Enables aggregateRolesForRBAC by default
- Updates README.md and CHANGELOG.md for relevant ClusterRole changes

(partially cherry picked from commit 3d6b8c94c7)
2022-01-06 11:32:28 -08:00
Arvind Iyengar 74439b3f23
(dev-v2.6-archive) Update default namespace to cattle-monitoring-system
(partially cherry picked from commit 701098fd72)
2022-01-06 11:32:27 -08:00
Arvind Iyengar 67f6d928ab
(dev-v2.6-archive) Update README to add rancher-monitoring changes
Adds prometheus-adapter and rancher-pushprox to the README.md and also
adds fields for Rancher Monitoring config

(partially cherry picked from commit 63647c6849)
2022-01-06 11:32:27 -08:00
Steven Crespo 071fc996e0
(dev-v2.6-archive) Update namespace annotation
- Update namespace annotation to `cattle-gatekeeper-system`
- Remove `gatekeeper-system` from templates as Rancher handles
namespaces for chart installation.

(partially cherry picked from commit 6e147640be)
2022-01-06 11:32:14 -08:00
Jacob Payne 16b52cb135
(dev-v2.6-archive) added kafka, splunk, syslog output support
(partially cherry picked from commit 75d396906a)
2022-01-06 11:32:14 -08:00
Arvind Iyengar 014be77b77
(dev-v2.6-archive) Remove CRD code from upstream
Removes the code that supports the Helm 2 hack for crd/ (`prometheus-operator/cleanup-crds.yaml` and
`prometheus-operator/crds.yaml`) and removes crd-install hooks from crds.

Also updates the README.md and CHANGELOG.md accordingly.

(partially cherry picked from commit 921f735cbc)
2022-01-06 11:32:12 -08:00
Brenda Rearden db4a2dd1e3
(dev-v2.6-archive) Update version to 1.6.7
(partially cherry picked from commit b0a79ea343)
2022-01-06 11:32:12 -08:00
Arvind Iyengar bdb8f7d3bf
(dev-v2.6-archive) Enable splitting CRDs to separate package
This commit adds script changes to automatically allow packages to split
the CRD components located in a crd/ directory into a separate package.

It also automatically adds in a validation yaml helper to the main package
to prevent a user from installing the base package without installing the crd
install package first.

Any package can enable the creation of a separate crd package by just adding
`splitCRDsIntoSeparatePackage: true` into the package.yaml, as shown in the
rancher-monitoring chart.

(partially cherry picked from commit fcc8528186)
2022-01-06 11:32:11 -08:00
Caleb Bron f893fe12c3
(dev-v2.6-archive) moving dev-charts to charts and fixing logo path
(partially cherry picked from commit a224a87038)
2022-01-06 11:32:10 -08:00
Caleb Bron 35c812165a
(dev-v2.6-archive) copy charts from dev-charts
(partially cherry picked from commit f7dd80a3c1)
2022-01-06 11:32:09 -08:00
Denise Schannon 3c2a851726
(dev-v2.6-archive) Initial commit
(partially cherry picked from commit 44e16849c3)
2022-01-06 11:32:09 -08:00
Caleb Bron 2087de28b5 clean up main 2020-09-30 16:45:24 -07:00
Arvind Iyengar e3d6033572 Support monitoring in hardened RKE clusters
This commit adds support for deploying rancher-monitoring into hardened clusters.

It modifies some of the default securityContexts and does some misc. fixes such as:
- Removing default AppArmor PSP annotations from Grafana (related to https://github.com/helm/charts/issues/9090)
- Modifying rkeScheduler and rkeControllerManager to use localhost to scrape components since the endpoints aren't exposed in a hardened cluster

These changes have been verified on a hardened RKE cluster.
2020-09-21 12:04:07 -07:00
Arvind Iyengar b80fb3a8ff Use separate namespace only for dashboards
This commit renames `grafana-dashboards` to `cattle-dashboards` and deprecates the `grafana-datasources` namespace in favor of the normal release namespace.

Related Issue: rancher/rancher#28887
2020-09-19 19:23:35 -07:00