From 4766b88be14db68276c98e1f770ef2e1659fbd93 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 12 May 2020 20:07:55 +0200 Subject: [PATCH] upgrade prometheus --- monitoring/manifests/alertmanager-tbrnt-config-secret.yaml | 2 +- monitoring/manifests/prometheus-prometheus.yaml | 4 ++-- monitoring/monitoring.jsonnet | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml index bc52d32..b8b0505 100644 --- a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml +++ b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml @@ -6,7 +6,7 @@ metadata: namespace: monitoring spec: encryptedData: - alertmanager.yaml: AgBXsELNPdwcMBR9vl4ZCj18D3aQHjsVXITCD2cshBl+o9fKHUkCYg2u9TOvt26Osi1rLo9ZV1QZthNBbp/65g+0l9lUXbWMeCHy80fCc0ISWf1+MN+L6Yeh71sNYY81HfaLoDWY48roanGN4IIF0hcEryVKfY9gOUzDkEag7ZY4lJ60/irUzUlTIEdak6IlwzGKpaokn0yitpbYRR1rkxIpdQ7jVJhCE5fSEw0xXU7NYuqOpKeYEZkHFCEMnLVnzIAVtMpJ0asLTnRFIj4hZa13USsX/Lm98Q41QTO0FpTNMurlCLgQPDTI5pdKJzyDFFOsMBwscO5T35ykXHcybsf6ykZ12gOlfhjfbU746/jCB3j5H0pGLmTRS1kChGaJOLpyXyTQeGpk79aJKOyn2ZaLxLpkfgFlK6amLH8QfOUJSTiCWvpMks38wnWlYKngT36kogUROY/72vBJKrz1bMkwOR+4ed4i+3KV/6K6d6vcMemmrXtgT8Z+2656vjLTDDIM1ztogACDI+urS49OigXiutzJlqbMGh2/IcSOeDaFO42qe1m4fDONAs4t0asuXmBv+eYbFffyRxVzkt5Or8jX1UUuy3ynzwHjjA+/PCVo5co32oL+kKQtM2FdYaNoHcikSNDog/XkUaTetE6WQAyS8o5+fT6SitirGOmQJyazYW71QT6O1aBW0vhowhcsvHxsV/5sfhZ7+M1SAdn/gI3VEYS46NNk4U3jg2u6JAXNbE4nObevS71HqcSRQjyPR+Od1DuCYiUm6HBk2lsIOZOstcLrhRpiKH7fNzEIlZUsWPwrosWMB+quks8tb1E2Xy4y8DkIyQ4hK9frNOfvORavjNUaBphw55A0/Bb9iXRIZ51KbtpqtEJWzO9Fhbu0iEoYLnkzx1h8JbSy+oHjPRIZJAwMdtLoWfc5liMrYaQu5/Y6qWWinnmZRKusQJLSgQIBcWQsJjwLZbbL/wvUU9Un6BBsMbH8sHdmqh1a8QPspFwFmOcxWWNrloHgACQfkDoh27LnMCFa7qloKI4JsQcp3uASiaOUEaU1Zidty3Y2zc8pvTY5iJhiagXIm7AnJLPzpmApqd6rniuan4IqR/rRW1yKXzvgRFW1B05tKSlg4XaZ87safhG8AAE2v0m3AStD7B68Ol7LGusGBiJcPJeGrDYWXae4TG+QcESdJ1GeulERjGtCgDvqCl/ylNYsR9Ud3wwk773JkIaq72OAi02pT01iruLYKAKIGZUyZOAwmWbkLvAMPB6HdKOq/oP/7uaylZu8YeuIFmj5gxv1fU2NQZecFQOwMww0D++6P8AhHRIeagSBAg3XFXhTNIzmOhqawdGNru2pfWSIBM32cGuJOdRQB+tYcEnaB/OFFSfAaiMbMTIgHhxHTHujPvyHIUXzG9CXSca+XjflP7e4KiBk3ztunWFlX/Dc42XHMIH+4vGTgYsMhZJl9Dyou/417Tr40vaSFQqfn6TaYQxH4zYbZt3dL3n9VtNlMRfPRDyjHEcuRib1DPPU4soI5jTVN6irfZ27IqFQNSqHsEBhhUV29M5T9UpuAhxR6l1O0WFEnumJbm4U72PEA2v5L/ooR4yKdO3/61MbCYjgI+nfFkxkj1Zd1yx789byhj5zeJCnTXw0SJvpSYCcQAAwd3a54qwO341NMwwKhvG57gBCy4j6fMtQY78fwbCFdCfGX7kKYfjdaw== + alertmanager.yaml: AgAYzhbUzzfgST7eCS45+8s2vOUojBTyWFEt0nArM+LTm+4wsBClZXKCGJGorU9MXc07BlqlowI5Ndcw4C+fB1lQAriLIQQ175Jtjta/e3pJqHhPZXWRnIxR2RlCMB3y861htLUtBUBTHOfw7DcqjCoK95dIG/7AWm9tpmbjDAxqeDF5YoXJ2JvDY5NJ3rdpOwgD+FlS8C1qkfk9LmVUSNCz9Gi2w4mF3VNNbb1CADyOKCOSDusYVnGLhY990wMNniT7h9in9ZtgbqtRipPFGBaWO0KM/sGYBaBrBF+/KO8jJsX+xEKIqXwYF6DYHUtoXFMRfUiG9qNK3H6MOVxGoyOhuMuPCLe4Dy7YevyX/BSht2/nbCWY4K3Lt6zNd0l341gAesfyUPdhcdmEXREd5YK2iZ62zmniCkatxA2SOf50numSYeeamdfhV5xlpXL9xT9IWLh5oFHpKp4x92/GCHk86o7ivltNpvbCgUSE29R+C3gk8E3LxFWcgFJqlHavaYHTuCZM2E+0mkk+uYXRz1evnQzc9IHII8SfxCAJ1eMIs9lLSlx9/4HqQjHhekQU3eR5zfsBQR6cBfOAl6qBYD0CdVwNndgZ5LnJ4OHka2BNhtzyFnvcJDSRYus3dbZrKuXRcJPOkMW5L+5vRMTsLe6RL0PVP3f2r2cVZZt8Xv7W8NxJ7Fw8Rm6AcZeeYk0VkczWM3x7Lqk5aOA1V7xglxKJT9xkoP6FTAkS6VGtvjm3G88FW/Nt7az2g3z4G3glPca0U8Toghv/czmPB+x2nnT8nPczKR0aAa9+BAksIUz7PshQhAEPhysmjR1IBZl75xPMCLMFjVpG7k7pN+fdagdUz3jrvLV9AfweBH3zlwjHMDv0hxwUxQ6frzVEThgRmp6oeCrfVjAm9aF2cwWjs8aHe2ezk+wLdCxGEI4SMFkmqgdoVSUTOL5lhhcDo4r7oVwG/zRfONhMVwfUz4FUmKY0356PFU9qqPd/zGrrTa0GTBO5DLOn7WQj47/3kiNvIyF/BmQ74XCT/J8usqV3YeT+vMvgBKTZBAtzKxOS1WtzrFZYbv/MuB9lVdFu9kcrb9pBDQEpy1vaP2SE5lyzMkO6Frp7LMy3UxJgV/ptzDP0RpZpWusOyHjbr9FVN9SiTlL1fm295UmmvYPXaNoJX74A6lwsh6AAQeGiSW2TW21eRYtZ5Vw0nUeV/UhYKoFKrirciaxTAS6OjvXIqGjMhaWeALW00kPm6MIFbd7+yIb6ypt1OcpxBwuXZ/J+m/BX588cVkFNi2WngzWqESAUfF4bB6n2Uc+zifNhFo5N5fA/ClN+QdaD4oorwTNqB2OXzG/kWZEuWFIXQdber+j2TZpoioT2CYK8LOi3wvBXZAsSJHb5VpHvUs0itrWg1oBbioyuAUp+oQgurkRZSfs98p4/2l207l3cnwTwceGBLLVeX3qkL7Ioin87O0xLc/pDvHK9Ef7uRiS7Ga8umOuGzIvYblSAfMRwh5z4tJ0eYfZ1Uea1/30h96lrhVmXgvWmhfiLwBhG4vQLzhjySoCI/21i1ssrGMX2Fl+fKdkKL8HrkBgSDodGvv/HLQ/zeQYXk/GAr+CEfAV4V76Ce1kgJhI9EsmHnIs8fNt3iiJCwVMYvvpo+Hd8Hn/SbOLljbuQYdNRd4K+tNPMkEwhtjshcmlAyKE/IH05VgGeoBlraReQVu7jXA== template: metadata: creationTimestamp: null diff --git a/monitoring/manifests/prometheus-prometheus.yaml b/monitoring/manifests/prometheus-prometheus.yaml index 9af40ff..a74d889 100644 --- a/monitoring/manifests/prometheus-prometheus.yaml +++ b/monitoring/manifests/prometheus-prometheus.yaml @@ -12,7 +12,7 @@ spec: namespace: monitoring port: web externalUrl: http://prometheus-k8s.monitoring:9090 - image: quay.io/prometheus/prometheus:v2.16.0 + image: quay.io/prometheus/prometheus:v2.17.2 nodeSelector: kubernetes.io/os: linux podMonitorNamespaceSelector: {} @@ -44,4 +44,4 @@ spec: requests: storage: 10Gi storageClassName: local-path - version: v2.16.0 + version: v2.17.2 diff --git a/monitoring/monitoring.jsonnet b/monitoring/monitoring.jsonnet index 258d914..3a3661c 100644 --- a/monitoring/monitoring.jsonnet +++ b/monitoring/monitoring.jsonnet @@ -15,7 +15,6 @@ local kp = namespace: 'monitoring', versions+:: { pushgateway: 'v1.1.0', - prometheus: 'v2.16.0', }, prometheus+:: { names: 'k8s',