Jiaqi Luo
9c6f4caa01
(dev-v2.6-archive) [rancher-monitoring] Add new annotations
...
(partially cherry picked from commit 0716f64e3c
)
2022-01-06 11:37:38 -08:00
Jiaqi Luo
e523133c3a
(dev-v2.6-archive) [rancher-monitoring] Update the Prometheus default memory limit to 3000Mi. issue: https://github.com/rancher/rancher/issues/35529
...
(partially cherry picked from commit ec7d19c434
)
2022-01-06 11:37:37 -08:00
Jiaqi Luo
f965b41942
(dev-v2.6-archive) [rancher-monitoring-crd] add the support for seting nodeSelector and tolerations https://github.com/rancher/rancher/issues/34439
...
(partially cherry picked from commit 531520da9c
)
2022-01-06 11:37:36 -08:00
Jiaqi Luo
5d26f4e0b8
(dev-v2.6-archive) [rancher-monitoring] update chart information
...
(partially cherry picked from commit 8a7dbb7a7b
)
2022-01-06 11:37:36 -08:00
Jiaqi Luo
7e381a6c44
(dev-v2.6-archive) [rancher-monitoring] some more fixes
...
(partially cherry picked from commit 2126dfed6b
)
2022-01-06 11:37:34 -08:00
Jiaqi Luo
0b0bdc3c5d
(dev-v2.6-archive) [rancher-monitoring] bump version
...
(partially cherry picked from commit d121e5f797
)
2022-01-06 11:37:34 -08:00
Jiaqi Luo
9901cba4df
(dev-v2.6-archive) [rancher-monitoring] set useTarArchive true
...
(partially cherry picked from commit 05089d2052
)
2022-01-06 11:37:33 -08:00
Jiaqi Luo
866376e483
(dev-v2.6-archive) [rancher-monitoring] update the template of rancher-crd chart to handle CRD tgz file
...
(partially cherry picked from commit 1225dc843a
)
2022-01-06 11:37:33 -08:00
Jiaqi Luo
9ac903397d
(dev-v2.6-archive) [rancher-monitoring] remove the duplicated line from the clusterrole.yaml
...
issue: https://github.com/rancher/rancher/issues/35264
(partially cherry picked from commit 45ccbe6d05
)
2022-01-06 11:37:32 -08:00
Jiaqi Luo
ac13d0fd26
(dev-v2.6-archive) Update rancher-monitoring to new base c6208979d494156a3869d2e5faab669ce4301c68, upstream chart kube-prometheus-stack 19.0.3
...
(partially cherry picked from commit d6f6f208df
)
2022-01-06 11:37:25 -08:00
Jiaqi Luo
980d7e2009
(dev-v2.6-archive) Rebase to c6208979d494156a3869d2e5faab669ce4301c68
...
(partially cherry picked from commit 3d2233d49e
)
2022-01-06 11:37:25 -08:00
Jiaqi Luo
33733f4819
(dev-v2.6-archive) Update rancher-monitoring to new base 12699d2f, upstream chart kube-prometheus-stack 19.0.0
...
(partially cherry picked from commit f299cdb7fb
)
2022-01-06 11:37:24 -08:00
Jiaqi Luo
142e5bcaa6
(dev-v2.6-archive) Rebase to 12699d2f
...
(partially cherry picked from commit 8cdd6851ed
)
2022-01-06 11:37:24 -08:00
Jiaqi Luo
1564e79cc7
(dev-v2.6-archive) Update rancher-monitoring to new base cc8b7c, upstream chart kube-prometheus-stack 18.0.0
...
(partially cherry picked from commit 31aee42627
)
2022-01-06 11:37:23 -08:00
Jiaqi Luo
7fe67cff90
(dev-v2.6-archive) Rebase to cc8b7c
...
(partially cherry picked from commit 5fba1eec93
)
2022-01-06 11:37:22 -08:00
Jiaqi Luo
beaa8cc39b
(dev-v2.6-archive) Update rancher-monitoring to new base ea0e187, upstream chart kube-prometheus-stack 17.0.0
...
(partially cherry picked from commit e1fecd7314
)
2022-01-06 11:37:21 -08:00
Jiaqi Luo
c314e527b4
(dev-v2.6-archive) Rebase to ea0e187
...
(partially cherry picked from commit 0b9eff2180
)
2022-01-06 11:37:20 -08:00
Jiaqi Luo
2d3f6561ba
(dev-v2.6-archive) Revert "Merge pull request #1621 from luthermonson/monitoring-win2022"
...
This reverts commit 01232b1780
, reversing
changes made to 0f3c2b7900
.
(partially cherry picked from commit 60aa84153e
)
2022-01-06 11:37:20 -08:00
Luther Monson
0bdcf9e7f6
(dev-v2.6-archive) bumping windows exporter for ltsc2022 support
...
(partially cherry picked from commit 3c190192ca
)
2022-01-06 11:37:18 -08:00
Arvind Iyengar
267efa9708
(dev-v2.6-archive) Merge pull request #1443 from aiyengar2/revert_rke2_windows
...
Revert "Merge pull request #1438 from aiyengar2/add_rke2_windows"
(partially cherry picked from commit 2543895e47
)
2022-01-06 11:36:00 -08:00
Caleb Bron
098745d39b
(dev-v2.6-archive) Merge pull request #1440 from manuelbuil/dev-v2.6-sriov
...
Move sriov chart to version to 100.x.x
(partially cherry picked from commit f94608f5ff
)
2022-01-06 11:35:59 -08:00
Arvind Iyengar
3829485a10
(dev-v2.6-archive) Revert "Merge pull request #1438 from aiyengar2/add_rke2_windows"
...
This reverts commit 0cc42d3464
, reversing
changes made to 2e4ae4f5a8
.
(partially cherry picked from commit f5ee817c09
)
2022-01-06 11:35:58 -08:00
Arvind Iyengar
8bcc4b0e07
(dev-v2.6-archive) Trigger windows components in logging if either windows field is true
...
(partially cherry picked from commit 19ab551eef
)
2022-01-06 11:35:55 -08:00
Colleen Murphy
44b0ec3904
(dev-v2.6-archive) Bump eks and gke operators to final releases
...
(partially cherry picked from commit 24f33ba4ae
)
2022-01-06 11:35:54 -08:00
Arvind Iyengar
ea74cd7933
(dev-v2.6-archive) Redo patches due to dependency modifications
...
(partially cherry picked from commit 30a749a867
)
2022-01-06 11:35:53 -08:00
Arvind Iyengar
ff4ef3dcd6
(dev-v2.6-archive) Add rke2Windows dependency
...
(partially cherry picked from commit c93b7a3d68
)
2022-01-06 11:35:52 -08:00
Arvind Iyengar
892a561d6f
(dev-v2.6-archive) Rename windowsExporter to rkeWindows
...
(partially cherry picked from commit 483a17cf25
)
2022-01-06 11:35:52 -08:00
Brenda Rearden
dc7b61faaf
(dev-v2.6-archive) Add cluster-tool annotation
...
Add cluster-tool Monitoring
Add cluster-tool annotation Alerting Drivers
Add cluster-tool annotation CIS Benchmark
Add cluster-tool annotation Istio
Add cluster-tool annotation Logging
Add cluster-tool annotation Longhorn
Add cluster-tool annotation OPA Gatekeeper
(partially cherry picked from commit 05ec4dbb83
)
2022-01-06 11:35:28 -08:00
Arvind Iyengar
c332870010
(dev-v2.6-archive) Bump nginx image
...
(partially cherry picked from commit e3398074ea
)
2022-01-06 11:35:25 -08:00
Arvind Iyengar
1cace26711
(dev-v2.6-archive) Add rewrite rule to Prometheus and Grafana for /k8s/clusters
...
(partially cherry picked from commit b93fe34e57
)
2022-01-06 11:34:57 -08:00
Arvind Iyengar
0300243b26
(dev-v2.6-archive) Merge pull request #1319 from aiyengar2/remove_alertmanager_secret_job
...
Remove alertmanager pre-install job in favor of Helm annotations
(partially cherry picked from commit 40cc26ecc0
)
2022-01-06 11:34:56 -08:00
Steven Crespo
a78bbef484
(dev-v2.6-archive) Fix vsphere cpi
...
- Add toggle to enable/disable rbac through chart values
- Add question to apply node selector label based on cluster type
- Update cloud controller manager labels/names to avoid conflict
(partially cherry picked from commit 557d26eb9c
)
2022-01-06 11:34:49 -08:00
Arvind Iyengar
751ca462f6
(dev-v2.6-archive) Remove alertmanager pre-install job in favor of Helm annotations
...
(partially cherry picked from commit d69ab2578e
)
2022-01-06 11:34:49 -08:00
Arvind Iyengar
434efe02f0
(dev-v2.6-archive) Merge pull request #1314 from aiyengar2/change_rancher_agent
...
Change CRD install image to rancher/shell and bump nginx
(partially cherry picked from commit 87f5494093
)
2022-01-06 11:34:47 -08:00
Michal Jura
a4b9d26485
(dev-v2.6-archive) Merge pull request #1308 from mjura/dev-v2.6
...
Bump aks-operator chart to 1.0.1-rc14
(partially cherry picked from commit 95dd4d82b5
)
2022-01-06 11:34:45 -08:00
Arvind Iyengar
0402151bdd
(dev-v2.6-archive) Bump nginx image
...
(partially cherry picked from commit 4b88995876
)
2022-01-06 11:34:44 -08:00
Donnie Adams
10891a4a16
(dev-v2.6-archive) Bump gke-operator chart to 1.1.1-rc6
...
(partially cherry picked from commit 6bef09778f
)
2022-01-06 11:34:42 -08:00
Arvind Iyengar
60fe375cf8
(dev-v2.6-archive) Use rancher/shell
...
(partially cherry picked from commit 75481c6cec
)
2022-01-06 11:34:41 -08:00
Arvind Iyengar
50131e19bc
(dev-v2.6-archive) Merge pull request #1274 from aiyengar2/rebase_monitoring
...
Rebase Monitoring to 16.x.x
(partially cherry picked from commit 89d8ad2713
)
2022-01-06 11:34:31 -08:00
Donnie Adams
83d80f13dd
(dev-v2.6-archive) Merge pull request #1289 from thedadams/bump-aks-v1.0.1-rc12
...
Bump aks-operator chart to 1.0.1-rc12
(partially cherry picked from commit 8400ee4596
)
2022-01-06 11:34:31 -08:00
Arvind Iyengar
bf3e6fbf0a
(dev-v2.6-archive) Manual changes to Monitoring for rebase
...
(partially cherry picked from commit a93a040b70
)
2022-01-06 11:34:30 -08:00
Arvind Iyengar
4738bc0d53
(dev-v2.6-archive) Update rancher-monitoring to new base ba91bdb2d79ca4419cf72078f5f4bfcc426d4599
...
(partially cherry picked from commit d49f60d38e
)
2022-01-06 11:34:29 -08:00
Arvind Iyengar
a473d32ba4
(dev-v2.6-archive) Rebase to ba91bdb2d79ca4419cf72078f5f4bfcc426d4599
...
(partially cherry picked from commit ef23466ebc
)
2022-01-06 11:34:28 -08:00
Arvind Iyengar
e5a760879f
(dev-v2.6-archive) Modify Windows dashboards for breaking changes
...
(cherry picked from commit d7708cc963
)
(partially cherry picked from commit 00db29b544
)
2022-01-06 11:34:28 -08:00
Arvind Iyengar
cdf102f638
(dev-v2.6-archive) Merge pull request #1278 from aiyengar2/check_monitoring
...
Add dummy openAPIV3Schema on pre-install step
(partially cherry picked from commit b24e4ee460
)
2022-01-06 11:34:20 -08:00
Jiaqi Luo
944b14aaab
(dev-v2.6-archive) bump rancher-backup to 2.2.0-rc1
...
(partially cherry picked from commit 494564d483
)
2022-01-06 11:34:11 -08:00
Arvind Iyengar
1110c8c82e
(dev-v2.6-archive) Add dummy openAPIV3Schema to initContainer and log patch
...
(partially cherry picked from commit 3202417f2d
)
2022-01-06 11:34:10 -08:00
Jiaqi Luo
667240cc68
(dev-v2.6-archive) update all charts' version to 100.0.0
...
(partially cherry picked from commit 09f8f4b5bf
)
2022-01-06 11:34:04 -08:00
Daishan Peng
6ca9fb2c05
(dev-v2.6-archive) Merge pull request #1257 from StrongMonkey/fleet-v0.3.6-rc1-2.6
...
Fleet v0.3.6-rc1
(partially cherry picked from commit 6da36d301f
)
2022-01-06 11:34:01 -08:00
Daishan
f4cb5b7eba
(dev-v2.6-archive) Make charts
...
(partially cherry picked from commit a9e2003ebb
)
2022-01-06 11:34:01 -08:00
Jiaqi Luo
5dcbb0283b
(dev-v2.6-archive) Merge pull request #1227 from jiaqiluo/pushprox-for-ingress-nginx-dev-v2.6
...
(partially cherry picked from commit 4f1aa0319f
)
2022-01-06 11:33:59 -08:00
Nick Gerace
091cda727d
(dev-v2.6-archive) Fix logging 3.10.0 and remove bad chart
...
(partially cherry picked from commit c320d24d50
)
2022-01-06 11:33:59 -08:00
Jiaqi Luo
ed9fa241d7
(dev-v2.6-archive) add sub-charts for scraping ingress-nginx in rke and rke2 clusters
...
(partially cherry picked from commit 1157b4a153
)
2022-01-06 11:33:58 -08:00
Arvind Iyengar
d7b9e7e2ba
(dev-v2.6-archive) Add kubelet and nodeExporter pushprox and bump image ( #1245 )
...
* Bump PushProx chart version
* Expose serviceMonitor endpoints and client SA RBAC
* Bump PushProx image to v0.1.0-rancher2
* Support hardened kubelet+nodeExporter & update k3s
* Generate charts
* Disable kubelet serviceMonitor if k3sServer enabled
* make charts
(partially cherry picked from commit a064b37d4e
)
2022-01-06 11:33:54 -08:00
Arvind Iyengar
2e2ec8ec2c
(dev-v2.6-archive) Move establishing CRD logic to a helper template
...
(partially cherry picked from commit 02ff0c9df8
)
2022-01-06 11:33:51 -08:00
Arvind Iyengar
00ab624721
(dev-v2.6-archive) Mimic Helm CRD install process by introducing wait
...
As part of the Helm CRD installation process shown [here](43853ea772/pkg/action/install.go (L160-L162)
), charts that both attempt to install CRDs and then install resources (e.g. `len(totalItems) > 0`) invalidate the cache and attempt to get the CRDs again to `Give time for the CRD to be recognized.` before continuing the Helm installation.
Because Monitoring V2 currently does not observe this invalidation and wait, flakey race conditions documented in issues like https://github.com/rancher/rancher/issues/32025 and https://github.com/rancher/rancher/issues/29171 can be caused. This commit introduces that invalidation process.
(partially cherry picked from commit 5f3bbe4a36
)
2022-01-06 11:33:50 -08:00
Colleen Murphy
dfc77a99a9
(dev-v2.6-archive) Merge pull request #1213 from cmurphy/dev-v2.6-aks-operator
...
Add aks-operator charts
(partially cherry picked from commit 556c9b1afa
)
2022-01-06 11:33:49 -08:00
Colleen Murphy
57998bd35d
(dev-v2.6-archive) Add aks-operator package
...
(partially cherry picked from commit 2abda43f33
)
2022-01-06 11:33:48 -08:00
Donnie Adams
91cf674a50
(dev-v2.6-archive) Merge pull request #1195 from thedadams/add-gke-operator
...
(partially cherry picked from commit 9f439d72ae
)
2022-01-06 11:33:47 -08:00
Donnie Adams
ed7f77d9af
(dev-v2.6-archive) Add gke-operator
...
(partially cherry picked from commit b608a65c41
)
2022-01-06 11:33:46 -08:00
Jiaqi Luo
cf569513fa
(dev-v2.6-archive) Merge pull request #1230 from jiaqiluo/update-monitoring-image-dev-v2.6
...
[dev-v2.6]update the image rancher/mirrored-library-nginx
(partially cherry picked from commit ef298fe102
)
2022-01-06 11:33:45 -08:00
Prachi Damle
d729c71088
(dev-v2.6-archive) Merge pull request #1229 from prachidamle/cis_k8s_version_tag_26
...
Updating cis-operator image tag to deliver fix for k8s upgrade issue
(partially cherry picked from commit d016ae3c10
)
2022-01-06 11:33:44 -08:00
Jiaqi Luo
0729838224
(dev-v2.6-archive) update the image rancher/mirrored-library-nginx
...
(partially cherry picked from commit 5480033c84
)
2022-01-06 11:33:43 -08:00
Arvind Iyengar
4dc8ac280d
(dev-v2.6-archive) Merge pull request #1224 from aiyengar2/fix_rke_2_etcd_default_2_6
...
[2.6] Add NoExecute toleration to rke2Etcd and remove key
(partially cherry picked from commit 9c5c1c5ef3
)
2022-01-06 11:33:40 -08:00
Donnie Adams
6b385a97b9
(dev-v2.6-archive) Change eks-operator version to v1.1.1
...
(partially cherry picked from commit 8d7f56d799
)
2022-01-06 11:33:39 -08:00
Arvind Iyengar
05c3912de8
(dev-v2.6-archive) Add NoExecute toleration to rke2Etcd and remove key
...
(cherry picked from commit a181ea3011
)
(partially cherry picked from commit 6239716e10
)
2022-01-06 11:33:38 -08:00
Arvind Iyengar
5c0f816c65
(dev-v2.6-archive) Fix monitoring Chart.yaml
...
This is required due to the change released in v0.1.0 of the charts-build-scripts to switch the package used for YAML marshalling / unmarshalling.
Note: This does not need a packageVersion bump since it has already been bumped once for this release.
(cherry picked from commit 7ec1716f66
)
(partially cherry picked from commit e2c9a0746b
)
2022-01-06 11:33:37 -08:00
Arvind Iyengar
775e5e62f2
(dev-v2.6-archive) Remove rcVersions
...
(partially cherry picked from commit b350bb93e0
)
2022-01-06 11:33:34 -08:00
Arvind Iyengar
63af4011e1
(dev-v2.6-archive) Checkout current packages from dev-v2.5-source
...
```bash
git fetch upstream
git checkout upstream/dev-v2.5-source -- packages; git reset HEAD; git checkout -- packages/README.md
```
(partially cherry picked from commit 551327b14e
)
2022-01-06 11:33:32 -08:00
actions
decb1db44b
(dev-v2.6-archive) Generated changes
...
(partially cherry picked from commit 88defdad62
)
2022-01-06 11:33:31 -08:00
aiyengar2
2304c5e0fb
(dev-v2.6-archive) Merge pull request #677 from aiyengar2/fix_magic_links
...
Fix broken magic links for Grafana and Prometheus
(partially cherry picked from commit f7cee8c5c7
)
2022-01-06 11:33:31 -08:00
Darren Shepherd
b2b0a96592
(dev-v2.6-archive) fleet v0.3.0-beta3
...
(partially cherry picked from commit 161b04a5e6
)
2022-01-06 11:33:30 -08:00
Arvind Iyengar
d652d4db01
(dev-v2.6-archive) Add nginx proxy to Prometheus for magic links
...
This commit adds an nginx proxy in front of Prometheus that intercepts the requests that are sent to the Prometheus pod. This change was necessary since the Prometheus pod encounters issues with Rancher proxy URLs that are formatted like:
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy
```
Specifically, if using the root_url option, it doubles up this URL when making requests for resources, e.g.
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/<my-path>
=>
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-prometheus:9090/proxy/<my-path>
```
However, this does not resolve the issue in https://github.com/rancher/rancher/issues/29068 .
(partially cherry picked from commit 92f0eca770
)
2022-01-06 11:33:30 -08:00
Arvind Iyengar
b9758f95c4
(dev-v2.6-archive) Add nginx proxy to Grafana for magic links
...
This commit adds an nginx proxy in front of Grafana that intercepts the requests that are sent to the Grafana pod. This change was necessary since the Grafana pod encounters issues with Rancher proxy URLs that are formatted like:
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy
```
Specifically, if using the root_url option, it doubles up this URL when making requests for resources, e.g.
```
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/<my-path>
=>
<server-url>/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/k8s/clusters/<cluster-id>/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/<my-path>
```
(partially cherry picked from commit d6c774aa42
)
2022-01-06 11:33:29 -08:00
maggieliu
2e262303da
(dev-v2.6-archive) Merge pull request #674 from aiyengar2/fix_monitoring_chart_hardened
...
Support monitoring in hardened RKE clusters
(partially cherry picked from commit 34fdd14bca
)
2022-01-06 11:33:28 -08:00
Steven Crespo
ed4687076b
(dev-v2.6-archive) Merge pull request #670 from PennyScissors/update-gk-v3.1.1
...
Update gatekeeper to version 3.1.1
(partially cherry picked from commit 32f1b41934
)
2022-01-06 11:33:26 -08:00
Steven Crespo
b21fe035b5
(dev-v2.6-archive) Update gatekeeper to v3.1.1
...
(partially cherry picked from commit 5757f8cc15
)
2022-01-06 11:33:25 -08:00
Arvind Iyengar
ae60d235cb
(dev-v2.6-archive) 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.
(partially cherry picked from commit e3d6033572
)
2022-01-06 11:33:25 -08:00
Arvind Iyengar
5b49312554
(dev-v2.6-archive) 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
(partially cherry picked from commit b80fb3a8ff
)
2022-01-06 11:33:23 -08:00
Arvind Iyengar
a4d132cf54
(dev-v2.6-archive) Split RBAC for ConfigMaps and Secrets
...
Related Issue: https://github.com/rancher/rancher/issues/29013
(partially cherry picked from commit 0fa3a06de0
)
2022-01-06 11:33:22 -08:00
Arvind Iyengar
a05cd088c8
(dev-v2.6-archive) Relocate Rancher roles to overlay/
...
(partially cherry picked from commit 2e1ed1b130
)
2022-01-06 11:33:22 -08:00
Arvind Iyengar
6e9ba81e6d
(dev-v2.6-archive) Add annotations that were left out on rebase
...
Dropped on accident in rebase https://github.com/rancher/charts/pull/641/files#diff-ed5b5b87cf149adc6a6408bf81993efdR681-R682
(partially cherry picked from commit 95cf887f5f
)
2022-01-06 11:33:21 -08:00
aiyengar2
d6e2d6fe20
(dev-v2.6-archive) Merge pull request #666 from aiyengar2/fix_kube_dns_namespace
...
Create kube-dns service monitor in kube-system
(partially cherry picked from commit 034952747f
)
2022-01-06 11:33:20 -08:00
Brenda Rearden
cea35722ed
(dev-v2.6-archive) Set installer repo,tag in values.yaml
...
(partially cherry picked from commit 9932422f51
)
2022-01-06 11:33:20 -08:00
Rajashree Mandaogane
d9d9732036
(dev-v2.6-archive) Merge pull request #663 from mrajashree/upd
...
Update resourceset to include configmaps for clusterrepos
(partially cherry picked from commit 820f105aa2
)
2022-01-06 11:33:19 -08:00
Arvind Iyengar
6d6bc2110a
(dev-v2.6-archive) Create kube-dns service monitor in kube-system
...
This is required since, by default, we ignoreNamespaceSelectors.
(partially cherry picked from commit 700975ee95
)
2022-01-06 11:33:19 -08:00
aiyengar2
f04ef106ae
(dev-v2.6-archive) Merge pull request #662 from aiyengar2/use_new_busybox
...
Replace rancher/busybox w/ rancher/library-busybox
(partially cherry picked from commit afb3af8690
)
2022-01-06 11:33:18 -08:00
Prachi Damle
866397beaa
(dev-v2.6-archive) Delete tgz files from assets, parameter in the post-install hook for namespace should use the
...
helm templating
(partially cherry picked from commit 2dd35d89bb
)
2022-01-06 11:33:16 -08:00
Brenda Rearden
8e6e45ad6d
(dev-v2.6-archive) Update kiali to 1.23.0
...
(partially cherry picked from commit d397bb512c
)
2022-01-06 11:33:16 -08:00
Daishan Peng
e7c5d7a499
(dev-v2.6-archive) Merge pull request #660 from StrongMonkey/add-rio-annotations
...
Add istio dependency to rio chart
(partially cherry picked from commit 4cd7a24bd8
)
2022-01-06 11:33:14 -08:00
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
Arvind Iyengar
0fa3a06de0
Split RBAC for ConfigMaps and Secrets
...
Related Issue: https://github.com/rancher/rancher/issues/29013
2020-09-19 19:23:33 -07:00
Arvind Iyengar
2e1ed1b130
Relocate Rancher roles to overlay/
2020-09-19 19:00:23 -07:00
Arvind Iyengar
95cf887f5f
Add annotations that were left out on rebase
...
Dropped on accident in rebase https://github.com/rancher/charts/pull/641/files#diff-ed5b5b87cf149adc6a6408bf81993efdR681-R682
2020-09-18 17:08:11 -07:00
Arvind Iyengar
700975ee95
Create kube-dns service monitor in kube-system
...
This is required since, by default, we ignoreNamespaceSelectors.
2020-09-18 15:35:21 -07:00
Arvind Iyengar
c263e58157
Replace rancher/busybox w/ rancher/library-busybox
...
Related Issue: https://github.com/rancher/rancher/issues/28978
2020-09-17 18:38:14 -07:00
Arvind Iyengar
178528b12c
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
2020-09-17 17:10:42 -07:00
Arvind Iyengar
d03ffe81df
Create Alertmanager secret in pre-install hook
2020-09-14 16:22:16 -07:00
Arvind Iyengar
4d5653b2ec
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
2020-09-10 17:23:47 -07:00
Arvind Iyengar
9fe6ed19c1
Use assumeOwnershipOfCRDs for rancher-monitoring
2020-09-09 15:25:13 -07:00
Brenda Rearden
da849a2dee
Add providesGVR to patch file and remove from package.yaml
2020-09-09 12:52:34 -07:00