add label selector to prometheus
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
9d44c5cd36
commit
d5b95ab32c
|
@ -19,3 +19,6 @@ apiVersion: v1
|
|||
kind: Namespace
|
||||
metadata:
|
||||
name: k8up
|
||||
labels:
|
||||
goldilocks.fairwinds.com/enabled: true
|
||||
prometheus: yes
|
||||
|
|
|
@ -21,3 +21,6 @@ apiVersion: v1
|
|||
kind: Namespace
|
||||
metadata:
|
||||
name: owntracks
|
||||
labels:
|
||||
goldilocks.fairwinds.com/enabled: true
|
||||
prometheus: yes
|
||||
|
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
namespace: monitoring
|
||||
spec:
|
||||
encryptedData:
|
||||
alertmanager.yaml: AgCmn2MDeDJDTtaU87sySKNcyibNy7aM+wZ9e97h/FK5yBghotZXG5eL56ycivW93wuE15p9thVh4RJ1wsE9/zKMMz47Khe21ha1Z+G1EIikTYkrwJvZMhRz5S17Q2vsR/FdwOQF6q+2alBwq7e+l8yZD7LHzOPczz3m4fdxSjkBZAdhDoo2a3ujYS7zkkADkmXPTyKyg2PHm5CE15XkZoMIg2hadQZHQ9E2FYNmoiEXsRaRTuMrSb9IsxwHMJXDfY8m39g0EooBUy17A/6x1yF8F5oEIknqi8+hC0PBGweQJ4b216ucNZDcAw+Vkj0Ym3RG6xg3XtdT6/aziosw/G26QQtYGbNofI+tZbIFAd4+BHmfhwd1gMhVcP0BV59erK4G/q+TzgAUHWf/WaMZ1N/ViN2yPne/7Pf2GumDBhZMoy1iYPUUpomsokE9FDjohQesly6cmwgmJ76SKDNhndigrVd+ogWep8ESCMfqhxG8UOJHtc++z6oYs9sK+M6/abtVBV+dL5Hl7xt0xgQ1gbpL+24RutcrJVBGeQlX5LHweVJVBD/iipzLOg/Ksj1YKqjN7ELaJzDoh4kqJaKzWfFDPtubENzFzMRqyFBHO/nzoGDdONLXjYXMnF+thN2nlXP5A135LO5Ttci3jO+WifmB8JNlbAXukT3bAnKxUF2yu1+e7UGGhm3I8i0b7ZSTU4b+yb3TBT9LaI5eUPL4vo0U/Ofw3+FeKyVz7IkB+6uXHRLbp6H/w49GH/fkM5I7bIYepe7YySFMVDNf4eOunhQ7bqOBdzGnXmu5XVG9ViMaGGY+y/12kMORG3NypZ3EGOYMSNpEMqjEBx4gCzR0CuvyT0ARSNaSmklXhSpAFTe6MCxERABY7u32M6K0zstZnWSCoGSeECxjvR24hPdVAy8gjQvvzA+ZNt30j4GE1EdrgktUeMZL8YuNlRQ0QeBFjK0nYePeIdzfy4/2MIOEG1/iyWzPKH8AsCL76YUp2Pc6HP0F3VBHXfrdJd5gm2hiIL9CDlui5sveawFu7XpsoX2mp+CARHDS1haEvl5NIaHHf/oH2etVgcLUUi291/vK6QrXpIJq6sDbPMtWPSbOiG8VzDZwEDq9FMV81JIVt9GpEpNnzaiBo8nwx/dRVMFWItWrS0QEYb1K2wgAYsMenFaniSn+aSjuTovT91l4bYscOXGhye1jXtyqqmoBQdCZgJUhAiRH6rtUGTVP+hoKdQhwqlX1I8VHck6XskWoPsXJQ3C9t0ftraM0ASEhTpH2loGcW2Ezc+IaeuFkIyATlmxiLx6PTk84TyJyA3FILpofCjpkMsYptGUTn560Fxoyexy2PbyNDHrXwQ6v0OpDhPpZ2GJAyHgUxSyp/N/AdO4OExNgEyAS0wGMyH7hhSE9o/npxRyy8VuUJsV060FE9bNfxYTFaqomUQP1ZB2oCtJxKe4axqqN8i5qPxARvHs/Hv8O7mAK/YeRuUAV9GUq4DePx/MC+e6UgH2DjLsLPPA++u0/n/wdNCspMKQL8x17SKdPGc0ovOMbRYxFGkWL0t+TC0quoo+Jjgms2ds1XNCyGNHCRmBbHPS3p1qtU23vsWVEJCcGxLI8V/m115Ru5P8CuLlP/KfAzesQbdxnxk+RIxsFPa0qE8T4LcO73H6r0z2KUUfK5iUNhjjSH5aDIBGoL1Do2tmZXLREOAWhlPvryWTJ5g==
|
||||
alertmanager.yaml: AgAt4qHTMHgNlti5rXewe3FaQhwDdM9SuW2ZDqKWE+Pnwr4lx+tl/NDzt+UE7xaJWQJDr7pSMo787g5sbzy5v1OxYG6cOcaNK/n8h4SWXim+S91fwvgVaemZ4l6nB1IJdkctLnqOz9Q1/MtAdVzWMJxk3sxoQFounnWZGfzmVybRhdeg93ionzFHK7lpRVZqRBrQRUnbILqEKYBQKfpnj0HadjHggSBAIDIp0NiNidmEHpeDy3dCjjEujJNwvZtUQoepm7bQ5bsFrcC/HUiqgDCRgo/SGZknaCtZaydXV2IgmyNjI5P/IfwUWPOlhA52ebs2dEDswfzj2OOq7JAmlmzorTT7joO+R1OfwFTvHcdjar/fbTm0ZJg1vbx0asxbL5BsXwwTtQVyr7oX0k25xeKe81folZSwUEy+Is5LhoU3VxUlX/cakYeRgPrwEHjX9CB/xs5/zZUoGeF2GIq6JsrFh4P0ZwPclB2HkXzE9pcjekgTi+cZzZ0MJq97phN7etIlq3HvuBgF+xb6zyZ+vD3W/5HPksUrJQX/2+U1RO+AzZ8pwMgTI7bXYiVuGjfpm0s8yoeBb9e6FkDGwwsop4tiAfrxmanF41sdW9og/YPqIRGFYKyI2hASxWbREKgBwKzUgU8DhoF2YJtL47UV+qq+/q0E3okraUIMwdoERbORA6+YgQaACvefq5PbUrLFVsjsmgWWW3wYL78pt/IZ6DEvD9GvJ0YjGIyEqBrfnPqnZeHP4GzMjn2leXy8SfygmfZ4rd6dPDq6nznOwTRQ4wPzG945rKX8A6vaDm8x57gZm1uVQptALNNCd7T6QaDhj9ZUPcJBhi4YHJIEVdlk/Fuy7asUNOhnL2pCv60QlApZMKIemrD2kyAs6GXipfvjr4uWbs+WjIdGdRdrSErAwglwDULasyHQroLz6e17Z4NMM2HoTdw/cOM1C/3VYqWmLx67oo3BykL8mcQGVdTyDkr2M5631UqR22C9AOjpTqCLeGSo9vmXpudgdrOEv3ZNqBraIhz1nF//MFun6fkTCQENsrcO5pr/yl2hbPRAf5TIh7mFguEblOfCSPgLE8ELYSCQzfb8PTexFq9oKnhyr8mct0fgrp/JXFduLkj5ue6FCKe6H13GbW/igQ02BYZKJVLOr8anF1GtwOpzXZAgy6RZbZc6a1M97i21m1IhHbNiy8Xc5IFOEqg822wU1EV21OdBTL+eDAldVi/NTmRfemOta/m9khzKE6xYFSWuq/ulXRrojtashIqjqCPWxUPt+VaAjispmWT38mo+Bw2A7fxa787MfC7nfCOXpr8x/5xJMBROJSBA//HLRQCdgdXZgEeIWfh/tbdEDbofv53fk4oKZPKiUH+jNiEGZot+Qf4nz2NLCdymTysehiHYCYyDheztXHv898zkhOdM9Oqsk4Pfw7BpWd+LheiRmhqyPBnhvkWz5uHSZ8rwx7ixVXQaWntLtsLILDwlXXZXGhX/JjIGzKBgYe/Gxax8ce5B7NL53HZhmZAJ1PEzXeNCAfRlHRRwejy4S/SF5hu9LiZnPjjYsJuga7XDmdq28k7lC5580s8WfCyHVmTQIsEgSk79H/w0LHYPz/KoXz3jy19Uryzue1RKa1EPeXV2Uw6p06IZiIHOPGidpTcgoTGXCj1oELzhuQ3S4HfvPGhdufWARdcpVNs6WV5ms3EO9vTyeSftNulAsQ==
|
||||
template:
|
||||
metadata:
|
||||
creationTimestamp: null
|
||||
|
|
|
@ -19,7 +19,7 @@ spec:
|
|||
- env:
|
||||
- name: GF_INSTALL_PLUGINS
|
||||
value: grafana-piechart-panel
|
||||
image: grafana/grafana:7.0.3
|
||||
image: grafana/grafana:7.0.5
|
||||
name: grafana
|
||||
ports:
|
||||
- containerPort: 3000
|
||||
|
|
|
@ -15,7 +15,13 @@ spec:
|
|||
image: quay.io/prometheus/prometheus:v2.17.2
|
||||
nodeSelector:
|
||||
kubernetes.io/os: linux
|
||||
podMonitorNamespaceSelector: {}
|
||||
podMonitorNamespaceSelector:
|
||||
matchExpressions:
|
||||
- key: prometheus
|
||||
operator: In
|
||||
values:
|
||||
- "yes"
|
||||
- "true"
|
||||
podMonitorSelector: {}
|
||||
replicas: 1
|
||||
resources:
|
||||
|
@ -31,7 +37,13 @@ spec:
|
|||
runAsNonRoot: true
|
||||
runAsUser: 1000
|
||||
serviceAccountName: prometheus-k8s
|
||||
serviceMonitorNamespaceSelector: {}
|
||||
serviceMonitorNamespaceSelector:
|
||||
matchExpressions:
|
||||
- key: prometheus
|
||||
operator: In
|
||||
values:
|
||||
- "yes"
|
||||
- "true"
|
||||
serviceMonitorSelector: {}
|
||||
storage:
|
||||
volumeClaimTemplate:
|
||||
|
|
|
@ -4,6 +4,8 @@ local ingress = k.extensions.v1beta1.ingress;
|
|||
local ingressTls = ingress.mixin.spec.tlsType;
|
||||
local ingressRule = ingress.mixin.spec.rulesType;
|
||||
local httpIngressPath = ingressRule.mixin.http.pathsType;
|
||||
local statefulSet = k.apps.v1.statefulSet;
|
||||
local selector = statefulSet.mixin.spec.selectorType;
|
||||
|
||||
local kp =
|
||||
(import 'kube-prometheus/kube-prometheus.libsonnet') +
|
||||
|
@ -15,7 +17,7 @@ local kp =
|
|||
namespace: 'monitoring',
|
||||
versions+:: {
|
||||
pushgateway: 'v1.1.0',
|
||||
grafana: '7.0.3',
|
||||
grafana: '7.0.5',
|
||||
},
|
||||
prometheus+:: {
|
||||
names: 'k8s',
|
||||
|
@ -50,6 +52,8 @@ local kp =
|
|||
spec+: {
|
||||
retention: '7d',
|
||||
externalUrl: 'http://prometheus-k8s.monitoring:9090',
|
||||
serviceMonitorNamespaceSelector: selector.withMatchExpressions({ key: 'prometheus', operator: 'In', values: ['yes', 'true'] }),
|
||||
podMonitorNamespaceSelector: selector.withMatchExpressions({ key: 'prometheus', operator: 'In', values: ['yes', 'true'] }),
|
||||
storage: {
|
||||
volumeClaimTemplate:
|
||||
pvc.new() +
|
||||
|
|
Reference in New Issue