diff --git a/monitoring/jsonnetfile.lock.json b/monitoring/jsonnetfile.lock.json index fea01b7..0e90e30 100644 --- a/monitoring/jsonnetfile.lock.json +++ b/monitoring/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "d8c8f903eee10b8391abaef7758c38b2cd393c55", + "version": "7f726db202a4285597c7076fee156e8b2737928f", "sum": "pk7mLpdUrHuJKkj2vhD6LGMU7P+oYYooBXAeZyZa398=" }, { @@ -28,8 +28,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "6f488250fd70a0bb438e802854d5b74d7c07b67f", - "sum": "2HRrgRAyMLHO7+nQnt979363oiqyUw/mtDpjwVksgcg=" + "version": "2c1fc1cc11547ca06a143fce6e430e4f7e0be294", + "sum": "Srp/B6oh85sEpjZxWOVyoBciNn6oA1SkjgLX4hUxsIE=" }, { "source": { @@ -48,7 +48,7 @@ "subdir": "grafonnet" } }, - "version": "8fb95bd89990e493a8534205ee636bfcb8db67bd", + "version": "5c6e8a8113486cdecd0961730aeaada3e6c69fe7", "sum": "tDuuSKE9f4Ew2bjBM33Rs6behLEAzkmKkShSt+jpAak=" }, { @@ -58,8 +58,8 @@ "subdir": "grafana-builder" } }, - "version": "881db2241f0c5007c3e831caf34b0c645202b4ab", - "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE=" + "version": "21b638f4e4922c0b6fde12120ed45d8ef803edc7", + "sum": "N65Fv0M2JvFE3GN8ZxP5xh1U5a314ey8geLAioJLzF8=" }, { "source": { @@ -79,8 +79,8 @@ "subdir": "" } }, - "version": "b61c5a34051f8f57284a08fe78ad8a45b430252b", - "sum": "7Hx/5eNm7ubLTsdrpk3b2+e/FLR3XOa4HCukmbRUCAY=" + "version": "fba82a1c0bc225127b084e91bd142c99b1792cb6", + "sum": "hJ5n6OeumIpKYuZQHwxL/rtpAJaW/qTFE9oOA8RWd7w=" }, { "source": { @@ -89,7 +89,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "b61c5a34051f8f57284a08fe78ad8a45b430252b", + "version": "fba82a1c0bc225127b084e91bd142c99b1792cb6", "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc=" }, { @@ -119,7 +119,7 @@ "subdir": "docs/node-mixin" } }, - "version": "08ce3c6dd430deb51798826701a395e460620d60", + "version": "7ad86f7994d6f1f290a28fcc2e16e54193e5ab9e", "sum": "3jFV2qsc/GZe2GADswTYqxxP2zGOiANTj73W/VNFGqc=" }, { @@ -129,7 +129,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "27f89ac651ce89307388bec31d73271f62f04f9a", + "version": "1861bf38f588b288bc66196aba1c2516f97aa90c", "sum": "lEzhZ8gllSfAO4kmXeTwl4W0anapIeFd5GCaCNuDe18=", "name": "prometheus" }, diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml index 8ea0727..befb6bb 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: AgC3lpA8g0tk5k1CWGqotAfmfUEpl63rM5nEcwitHU+kJT81lPtV3ZYYXvB2I21zhYvRLJTkD8a/GfOY6mV7fXnl9bVgwInnhP2sAKUTtmBNTGtVPolAs0L6Yyodc+OGTK9z/LxYc/K6FzzjSa9BycvvTRI6b2+ccmjE6VEpuQd934ZQH9aJuMhhl+pFpjJdtr2fRH86QMF+hr4MedK/eFNlB2RM++JYW1PhMem5dH9uNMI+W1jKLO+ih2Orgqo8Gsz9YkpK5NysydXwNwFvdBFRXIeBSE495s76I4n5RwamaMfYWwFkgaWc69Z0lOa6zIflXckyOPcyUIBJBQIolv2vDlzMxfMPTMm9Yd7KjMc19IQKLiLmbrxVlfomgnqm4G0svtd8c/Rp/i5T4tStDTb3Jy3UQMOZ1VBO3xqQyOa60Urp1qpHRz5VOmAiB7hics/2GMADhAOCMZF13LEs6QnjLoaZWzfHaug5YoUKXXonfijTFK4ogvZdWJLe899CQg5cVOf+IrhWQpWE7+PoQpjHqz4fS6MHziSwFFPomu4zstLY2LpvtvWCa/6kuXxwIB1gaUIJ/Z4P/W7s0Q62uR5J2guaR7njEd+jyP3wEJlPN0SvIb+q9uXVMPQckpXqD+vY6/8I4Ks5m9nTrFKPSN4v1w/EWZSeS4a914+EUGMOtkFktSzO7+glcnu90LzgKIc/20DxGB4CZS0clHCfQI0P3zVGI+lWjy/AQAEfYtLUaiDzXaAKo2J1bbPqzQMLWA6Yz7vITXiN/DTCOicqBerZZt0y0gX1eENivLSQyWqf9FFUZnG73CEpz5xBSu9ToAL9J1Mkd1jyEVHEySGRGw/zR5JP8q3rmGvd7lN07SvSpl1hayccqEQo1NYzJfI422RTuqS95Fn78qCp84KmYas9hu0+I5lBzitoqtyibiWp4uwlkbeYAE6CCsZkPN35VTeVyLz+mGc7D7dn/QO4jQ6pw/DLO/DQ2//Xqd1npqhQ1MSyYYIIUA10NjnQUm2RggNu3qNA8O+7YzwAK0VJicL76MVEDYVh2Y80gCMKl2iRlDhrkW+EJ1ZQZUp9KLhcTYqmEo3lolkvHonMikwn6x/Ai0eZw7o3XzfiNSx9AjoOpfS3kg7w2y6qRqUt1XhgVL2xIq7JgWnJ3dcjKPVjKoVARhIZKwHIkfXBbYnkGG88MoMlFIhKqi1ixFCo0XRP6exAY+yhQnVbnVn+d/rNOXzHAvR5ydyZwU21AigypFdVnYz3BKyQT+AKf2GK46KfuX3lQuvnInccpyMKURNTJFG7eLL3j1xddMx88OPG22sWoN3JNL+Q5QxgtjoM4mIaHInsEqmBkYD5ICASsQwfxg+YSmkFG1YLiDa7Nf5QB0ZjdbUAzbpuUYUuzHftypdqJf2Gl0851szg1gqumK7PIX7puChw7tdfcJGi+F+n02lK8fi5LJR8JKvGSwxR0YoLFJ2/afEaGB6iJfs2kT90jXZT+DI1WRFigIMZQPHJ0BWrZ05vAfRRWgeeZnvFdfiiuc96fAduDXhJuEo+Qxj6DKgITchMCmzUMm3YG374HMd1uZO6Ir8Ue8GXu+KFg33XxHpC9sZ0bhAn3KM2HRVkZHIrBlhgVgRh2igic8dZzKGUvDgl7GJccFr1yGvEVl8Gf5JApRSIqclVEYqZsbTMHsgquTnJtCWzMvhdookJUXmP78bfjA== + alertmanager.yaml: AgAUgFUQ3FCaW6xCoZX6R6dU0hV2nzQbaOnjI/qpz8D7ePsT9rnPPBXOj+1HsTlX7O+D1gYNcRlChW2AD/0kGot36OAO2Iv6lCZQpWSTP2bf0Sy6+VWHkDlu8mbQbeeXKLePFi5buuhHkC4w9MefHYoxaxbq7L7rfboI6Pt/blse2+kl7Gr8YPbHkPDR7nginv62ZxJzPQZrhfi4XHGihCBzO1dA5F/Zb2cDiKIhdlUegqV3TcfRW4nqGmXhalLhpBOFxkjY1P3iUR6SNXdl3sR7w29QXMboFzQYQ4e+eAhx2EJyZT1cKducrNuJeq8ny2huFDwiuTfufOQgG0SF3A++ILjp738d7QjO1KFNDIIex6KqLPKjv5wes7msge7u9vWy2sDeG2vrbULDlj4emUDia0pK8luBPXuBoG5jxhMZpr8P3DS9Q6CaI+rAwlbYoN3Txr5SRJLhhal3Po78uwBSxtbMWJ7F/PutpuM8UlC4soix2EyMHvpkvUrjUg/IXJliuCBq5C0wSWAFzEuZT7YaUm8lf7GeZMQkRUrwxaB85GFymtli3IIQYT1LBdmqmisYdnhKIbkXUf35813BHeYbKrYGQ3rYQYA8hg60NDR509vgqUQsbDONt5aQ2wyaSUv56cuBiNoLqRur96y41ydyZPaFPH7C7DDjiJQSVKfA9BkWMS2FZJguPkHhQyqNyLz+UC6f7huZd5ATXBYJDrHDvC6SUngn4EaP6NH9Rl2UHW4PBPnNzsMrMNJx84jDjkc4orjz3M+yv2naB575dSoGxAheQg6E7RShuYeQ7cLoJxgthLM5q7bLL4QYxmzUxlmywTsjvTijwyDpfL579C8xsLBMRo3cqR5NrEx99Ti2Xfk9eefCXYwMAs9oLMkQiVRCIVpjOOtwO5gDnFriBdnUVSaEOz2MnR83fxfLrIWPrbuGYHRwwqv4csJIWm4YMJxnTIMBG2gjgWqYd7g67gU+Hj8e+NdIHRY7EEKGdJNg6Jfx3EdU/jxDQyy/N1taK9+zG4FZJ+z0OTRCnOS+S4Mlc9de8QUd6xZ4Q+eiByG3OwaPHim6qlMLJeQa3beQdcmD9as2FHnNRSFDTwQu5OyhP/hWO0mTNEEP5cvetLKr7uhEDs65bp//rUrzYzEjaT71iFAkKH5xJ9NVqIVKzE9G0DjqGy7PGG6dbUY7HbKzfoeKA+1vv3QGeaUM01NUNDf3cSaQuUcmcbMbwaFIFgP3qAgFG7+NHKGZuAnqSHalpK/vlNv8fcpkVfzBrbkNXbBsD6ixGqc/fekZjyVdzZ3SsvCTkQytNcwKRL/vTNYMsSuUAjQuBS3z/j4Szi6Gk6caOjrNA8nK3IfVp+M1BN0aellgUD7UhbhCrwYcbwhYHzALY+7oLrAQ+eEePEoPflJj3tiTp2TsVWnPEGDbMhGduxee6oKP87vVYEC6L6fd97twrQZ2NEon7lM1t0XyMj+RM7GwsMd6LHpo4/ZWub4WpdEhU1NVQAalZybDUT+1/ZtpWV7aU9u9JqjbH5CwNi3/RcMktaE1R+kAeMkkCsbyaB+4n3LOLK8fiOhXBwwsWnQgO1WKtyyichaA492nIE3Jf3qLyW6vKhIqB+OeTIh+kxjp0dG04oMAeVkGB6ho4A9Pqnc7PwEY5tHKrnpXR+fyndTeCk0x2u/jl7jWcdKn9vLXoDUiKAJTSMAAzcZATsQkYQ== template: metadata: creationTimestamp: null diff --git a/monitoring/manifests/grafana-dashboardDefinitions.yaml b/monitoring/manifests/grafana-dashboardDefinitions.yaml index d5c6232..7d05cb9 100644 --- a/monitoring/manifests/grafana-dashboardDefinitions.yaml +++ b/monitoring/manifests/grafana-dashboardDefinitions.yaml @@ -5662,6 +5662,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", "pattern": "Value #A", @@ -5680,6 +5681,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to workloads", "linkUrl": "./d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", "pattern": "Value #B", @@ -5698,6 +5700,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -5716,6 +5719,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -5734,6 +5738,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -5752,6 +5757,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -5770,6 +5776,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #G", @@ -5788,6 +5795,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", "pattern": "namespace", @@ -6081,6 +6089,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", "pattern": "Value #A", @@ -6099,6 +6108,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to workloads", "linkUrl": "./d/a87fb0d919ec0ea5f6543124e16c42a5/k8s-resources-workloads-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell_1", "pattern": "Value #B", @@ -6117,6 +6127,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -6135,6 +6146,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -6153,6 +6165,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -6171,6 +6184,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -6189,6 +6203,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #G", @@ -6207,6 +6222,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", "pattern": "namespace", @@ -6403,6 +6419,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -6421,6 +6438,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -6439,6 +6457,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -6457,6 +6476,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -6475,6 +6495,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -6493,6 +6514,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -6511,6 +6533,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/85a562078cdf77779eaa1add43ccec1e/k8s-resources-namespace?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$__cell", "pattern": "namespace", @@ -8071,6 +8094,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -8089,6 +8113,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -8107,6 +8132,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -8125,6 +8151,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -8143,6 +8170,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -8161,6 +8189,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -8471,6 +8500,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -8489,6 +8519,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -8507,6 +8538,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -8525,6 +8557,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -8543,6 +8576,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -8561,6 +8595,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -8579,6 +8614,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #G", @@ -8597,6 +8633,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #H", @@ -8615,6 +8652,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -8820,6 +8858,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -8838,6 +8877,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -8856,6 +8896,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -8874,6 +8915,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -8892,6 +8934,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -8910,6 +8953,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -8928,6 +8972,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -9936,6 +9981,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -9954,6 +10000,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -9972,6 +10019,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -9990,6 +10038,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -10008,6 +10057,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -10026,6 +10076,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "pod", @@ -10301,6 +10352,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -10319,6 +10371,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -10337,6 +10390,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -10355,6 +10409,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -10373,6 +10428,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -10391,6 +10447,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -10409,6 +10466,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #G", @@ -10427,6 +10485,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #H", @@ -10445,6 +10504,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "pod", @@ -11021,6 +11081,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -11039,6 +11100,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -11057,6 +11119,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -11075,6 +11138,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -11093,6 +11157,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -11111,6 +11176,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "container", @@ -11421,6 +11487,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -11439,6 +11506,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -11457,6 +11525,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -11475,6 +11544,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -11493,6 +11563,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -11511,6 +11582,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -11529,6 +11601,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #G", @@ -11547,6 +11620,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #H", @@ -11565,6 +11639,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "container", @@ -12624,6 +12699,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -12642,6 +12718,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -12660,6 +12737,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -12678,6 +12756,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -12696,6 +12775,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -12714,6 +12794,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -12989,6 +13070,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -13007,6 +13089,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -13025,6 +13108,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -13043,6 +13127,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -13061,6 +13146,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -13079,6 +13165,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -13257,6 +13344,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -13275,6 +13363,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -13293,6 +13382,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -13311,6 +13401,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -13329,6 +13420,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -13347,6 +13439,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -13365,6 +13458,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/6581e46e4e5c7ba40a07646395ef7b23/k8s-resources-pod?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-pod=$__cell", "pattern": "pod", @@ -14658,6 +14752,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -14676,6 +14771,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -14694,6 +14790,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -14712,6 +14809,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -14730,6 +14828,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -14748,6 +14847,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -14766,6 +14866,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", "pattern": "workload", @@ -14784,6 +14885,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "workload_type", @@ -15103,6 +15205,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 0, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -15121,6 +15224,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -15139,6 +15243,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -15157,6 +15262,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -15175,6 +15281,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -15193,6 +15300,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -15211,6 +15319,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$__cell_2", "pattern": "workload", @@ -15229,6 +15338,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "workload_type", @@ -15416,6 +15526,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -15434,6 +15545,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -15452,6 +15564,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #C", @@ -15470,6 +15583,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #D", @@ -15488,6 +15602,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #E", @@ -15506,6 +15621,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #F", @@ -15524,6 +15640,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": true, + "linkTargetBlank": false, "linkTooltip": "Drill down to pods", "linkUrl": "./d/a164a7f0339f99e89cea5cb47e9be617/k8s-resources-workload?var-datasource=$datasource&var-cluster=$cluster&var-namespace=$namespace&var-workload=$__cell&var-type=$type", "pattern": "workload", @@ -15542,6 +15659,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "workload_type", @@ -28552,6 +28670,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #A", @@ -28570,6 +28689,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "Value #B", @@ -28588,6 +28708,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "instance", @@ -28606,6 +28727,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "job", @@ -28624,6 +28746,7 @@ items: "dateFormat": "YYYY-MM-DD HH:mm:ss", "decimals": 2, "link": false, + "linkTargetBlank": false, "linkTooltip": "Drill down", "linkUrl": "", "pattern": "version", diff --git a/monitoring/manifests/prometheus-adapter-deployment.yaml b/monitoring/manifests/prometheus-adapter-deployment.yaml index a0b401a..6f7c673 100644 --- a/monitoring/manifests/prometheus-adapter-deployment.yaml +++ b/monitoring/manifests/prometheus-adapter-deployment.yaml @@ -25,7 +25,7 @@ spec: - --metrics-relist-interval=1m - --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local:9090/ - --secure-port=6443 - image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.7.0 + image: directxman12/k8s-prometheus-adapter:v0.7.0 name: prometheus-adapter ports: - containerPort: 6443 diff --git a/monitoring/manifests/prometheus-rules.yaml b/monitoring/manifests/prometheus-rules.yaml index ef5a4da..aefacdf 100644 --- a/monitoring/manifests/prometheus-rules.yaml +++ b/monitoring/manifests/prometheus-rules.yaml @@ -1129,16 +1129,6 @@ spec: for: 15m labels: severity: warning - - alert: KubeCronJobRunning - annotations: - message: CronJob {{ $labels.namespace }}/{{ $labels.cronjob }} is taking more - than 1h to complete. - runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecronjobrunning - expr: | - time() - kube_cronjob_next_schedule_time{job="kube-state-metrics"} > 3600 - for: 1h - labels: - severity: warning - alert: KubeJobCompletion annotations: message: Job {{ $labels.namespace }}/{{ $labels.job_name }} is taking more @@ -1240,19 +1230,19 @@ spec: for: 5m labels: severity: warning - - alert: KubeQuotaExceeded + - alert: KubeQuotaFullyUsed annotations: message: Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota. - runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotaexceeded + runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubequotafullyused expr: | kube_resourcequota{job="kube-state-metrics", type="used"} / ignoring(instance, job, type) (kube_resourcequota{job="kube-state-metrics", type="hard"} > 0) - > 0.90 + >= 1 for: 15m labels: - severity: warning + severity: info - alert: CPUThrottlingHigh annotations: message: '{{ $value | humanizePercentage }} throttling of CPU in namespace @@ -1391,43 +1381,6 @@ spec: short: 6h - name: kubernetes-system-apiserver rules: - - alert: KubeAPILatencyHigh - annotations: - message: The API server has an abnormal latency of {{ $value }} seconds for - {{ $labels.verb }} {{ $labels.resource }}. - runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapilatencyhigh - expr: | - cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{job="apiserver",quantile="0.99"} - > - 1 - and on (verb,resource) - ( - cluster:apiserver_request_duration_seconds:mean5m{job="apiserver"} - > - on (verb) group_left() - ( - avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{job="apiserver"} >= 0) - + - 2*stddev by (verb) (cluster:apiserver_request_duration_seconds:mean5m{job="apiserver"} >= 0) - ) - ) > on (verb) group_left() - 1.2 * avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{job="apiserver"} >= 0) - for: 5m - labels: - severity: warning - - alert: KubeAPIErrorsHigh - annotations: - message: API server is returning errors for {{ $value | humanizePercentage - }} of requests for {{ $labels.verb }} {{ $labels.resource }} {{ $labels.subresource - }}. - runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeapierrorshigh - expr: | - sum(rate(apiserver_request_total{job="apiserver",code=~"5.."}[5m])) by (resource,subresource,verb) - / - sum(rate(apiserver_request_total{job="apiserver"}[5m])) by (resource,subresource,verb) > 0.05 - for: 10m - labels: - severity: warning - alert: KubeClientCertificateExpiration annotations: message: A client certificate used to authenticate to the apiserver is expiring diff --git a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 2001cd0..b787e48 100644 --- a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -104,7 +104,7 @@ local configMapList = k3.core.v1.configMapList; namespace: 'default', versions+:: { - grafana: '6.6.0', + grafana: '6.7.4', }, tlsCipherSuites: [ diff --git a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 0d959c5..666ffeb 100644 --- a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -15,6 +15,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, nodeExporter+:: { + listenAddress: '127.0.0.1', port: 9100, labels: { 'app.kubernetes.io/name': 'node-exporter', @@ -95,7 +96,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; local nodeExporter = container.new('node-exporter', $._config.imageRepos.nodeExporter + ':' + $._config.versions.nodeExporter) + container.withArgs([ - '--web.listen-address=127.0.0.1:' + $._config.nodeExporter.port, + '--web.listen-address=' + std.join(':', [$._config.nodeExporter.listenAddress, std.toString($._config.nodeExporter.port)]), '--path.procfs=/host/proc', '--path.sysfs=/host/sys', '--path.rootfs=/host/root', diff --git a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index 61375eb..ff51e9f 100644 --- a/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/monitoring/vendor/github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -9,7 +9,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, imageRepos+:: { - prometheusAdapter: 'quay.io/coreos/k8s-prometheus-adapter-amd64', + prometheusAdapter: 'directxman12/k8s-prometheus-adapter', }, prometheusAdapter+:: { diff --git a/monitoring/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet b/monitoring/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet index eca9cba..92a5590 100644 --- a/monitoring/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet +++ b/monitoring/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet @@ -282,6 +282,7 @@ type: if std.objectHas(labelStyle, 'type') then labelStyle.type else 'number', unit: if std.objectHas(labelStyle, 'unit') then labelStyle.unit else 'short', link: std.objectHas(labelStyle, 'link'), + linkTargetBlank: if std.objectHas(labelStyle, 'linkTargetBlank') then labelStyle.linkTargetBlank else false, linkTooltip: if std.objectHas(labelStyle, 'linkTooltip') then labelStyle.linkTooltip else 'Drill down', linkUrl: if std.objectHas(labelStyle, 'link') then labelStyle.link else '', }, diff --git a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md index 8e4f85c..22abee9 100644 --- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md +++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md @@ -7,16 +7,21 @@ A set of Grafana dashboards and Prometheus alerts for Kubernetes. ## Releases -| Release | Kubernetes Compatibility | Prometheus Compatibility | +| Release branch | Kubernetes Compatibility | Prometheus Compatibility | | ------- | -------------------------- | ------------------------ | -| master | Kubernetes 1.14+ | Prometheus 2.11.0+ | -| v0.1.x | Kubernetes 1.13 and before | | +| release-0.1 | v1.13 and before | | +| release-0.2 | v1.14.1 and before | v2.11.0+ | +| release-0.3 | v1.17 and before | v2.11.0+ | +| release-0.4 | v1.18 | v2.11.0+ | +| master | v1.18+ | v2.11.0+ | In Kubernetes 1.14 there was a major [metrics overhaul](https://github.com/kubernetes/enhancements/issues/1206) implemented. Therefore v0.1.x of this repository is the last release to support Kubernetes 1.13 and previous version on a best effort basis. Some alerts now use Prometheus filters made available in Prometheus 2.11.0, which makes this version of Prometheus a dependency. +Warning: This compatibility matrix was initially created based on experience, we do not guarantee the compatibility, it may be updated based on new learnings. + ## How to use This mixin is designed to be vendored into the repo with your infrastructure config. @@ -232,6 +237,16 @@ Same result can be achieved by modyfying the existing `config.libsonnet` with th ## Background +### Alert Severities +While the community has not yet fully agreed on alert severities and their to be used, this repository assumes the following paradigms when setting the severities: + +* Critical: An issue, that needs to page a person to take instant action +* Warning: An issue, that needs to be worked on but in the regular work queue or for during office hours rather than paging the oncall +* Info: Is meant to support a trouble shooting process by informing about a non-normal situation for one or more systems but not worth a page or ticket on its own. + + +### Architecture and Technical Decisions + * For more motivation, see "[The RED Method: How to instrument your services](https://kccncna17.sched.com/event/CU8K/the-red-method-how-to-instrument-your-services-b-tom-wilkie-kausal?iframe=no&w=100%&sidebar=yes&bg=no)" talk from CloudNativeCon Austin. * For more information about monitoring mixins, see this [design doc](https://docs.google.com/document/d/1A9xvzwqnFVSOZ5fD3blKODXfsat5fg6ZhnKu9LK3lB4/edit#). diff --git a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/apps_alerts.libsonnet b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/apps_alerts.libsonnet index 534701c..f7fc28e 100644 --- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/apps_alerts.libsonnet +++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/apps_alerts.libsonnet @@ -203,19 +203,6 @@ }, 'for': '15m', }, - { - alert: 'KubeCronJobRunning', - expr: ||| - time() - kube_cronjob_next_schedule_time{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s} > 3600 - ||| % $._config, - 'for': '1h', - labels: { - severity: 'warning', - }, - annotations: { - message: 'CronJob {{ $labels.namespace }}/{{ $labels.cronjob }} is taking more than 1h to complete.', - }, - }, { alert: 'KubeJobCompletion', expr: ||| diff --git a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kube_apiserver.libsonnet b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kube_apiserver.libsonnet index 51c7f7d..48d6aa0 100644 --- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kube_apiserver.libsonnet +++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kube_apiserver.libsonnet @@ -45,48 +45,6 @@ local utils = import 'utils.libsonnet'; { name: 'kubernetes-system-apiserver', rules: [ - { - alert: 'KubeAPILatencyHigh', - expr: ||| - cluster_quantile:apiserver_request_duration_seconds:histogram_quantile{%(kubeApiserverSelector)s,quantile="0.99"} - > - %(kubeAPILatencyWarningSeconds)s - and on (verb,resource) - ( - cluster:apiserver_request_duration_seconds:mean5m{%(kubeApiserverSelector)s} - > - on (verb) group_left() - ( - avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{%(kubeApiserverSelector)s} >= 0) - + - 2*stddev by (verb) (cluster:apiserver_request_duration_seconds:mean5m{%(kubeApiserverSelector)s} >= 0) - ) - ) > on (verb) group_left() - 1.2 * avg by (verb) (cluster:apiserver_request_duration_seconds:mean5m{%(kubeApiserverSelector)s} >= 0) - ||| % $._config, - 'for': '5m', - labels: { - severity: 'warning', - }, - annotations: { - message: 'The API server has an abnormal latency of {{ $value }} seconds for {{ $labels.verb }} {{ $labels.resource }}.', - }, - }, - { - alert: 'KubeAPIErrorsHigh', - expr: ||| - sum(rate(apiserver_request_total{%(kubeApiserverSelector)s,code=~"5.."}[5m])) by (resource,subresource,verb) - / - sum(rate(apiserver_request_total{%(kubeApiserverSelector)s}[5m])) by (resource,subresource,verb) > 0.05 - ||| % $._config, - 'for': '10m', - labels: { - severity: 'warning', - }, - annotations: { - message: 'API server is returning errors for {{ $value | humanizePercentage }} of requests for {{ $labels.verb }} {{ $labels.resource }} {{ $labels.subresource }}.', - }, - }, { alert: 'KubeClientCertificateExpiration', expr: ||| diff --git a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet index d15d736..89c1882 100644 --- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet +++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet @@ -91,16 +91,16 @@ 'for': '5m', }, { - alert: 'KubeQuotaExceeded', + alert: 'KubeQuotaFullyUsed', expr: ||| kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="used"} / ignoring(instance, job, type) (kube_resourcequota{%(prefixedNamespaceSelector)s%(kubeStateMetricsSelector)s, type="hard"} > 0) - > 0.90 + >= 1 ||| % $._config, 'for': '15m', labels: { - severity: 'warning', + severity: 'info', }, annotations: { message: 'Namespace {{ $labels.namespace }} is using {{ $value | humanizePercentage }} of its {{ $labels.resource }} quota.', diff --git a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/runbook.md b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/runbook.md index 137b4c4..13f6b68 100644 --- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/runbook.md +++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/runbook.md @@ -57,11 +57,6 @@ This page collects this repositories alerts and begins the process of describing + *Message*: `A number of pods of daemonset {{$labels.namespace}}/{{$labels.daemonset}} are running where they are not supposed to run.` + *Severity*: warning -##### Alert Name: "KubeCronJobRunning" -+ *Message*: `CronJob {{ $labels.namespace }}/{{ $labels.cronjob }} is taking more than 1h to complete.` -+ *Severity*: warning -+ *Action*: Check the cronjob using `kubectl describe cronjob ` and look at the pod logs using `kubectl logs ` for further information. - ##### Alert Name: "KubeJobCompletion" + *Message*: `Job {{ $labels.namespace }}/{{ $labels.job_name }} is taking more than 1h to complete.` + *Severity*: warning @@ -85,9 +80,9 @@ This page collects this repositories alerts and begins the process of describing ##### Alert Name: "KubeMemOvercommit" + *Message*: `Overcommited Memory resource request quota on Namespaces.` + *Severity*: warning -##### Alert Name: "KubeQuotaExceeded" +##### Alert Name: "KubeQuotaFullyUsed" + *Message*: `{{ $value | humanizePercentage }} usage of {{ $labels.resource }} in namespace {{ $labels.namespace }}.` -+ *Severity*: warning ++ *Severity*: info ### Group Name: "kubernetes-storage" ##### Alert Name: "KubePersistentVolumeFillingUp" + *Message*: `The persistent volume claimed by {{ $labels.persistentvolumeclaim }} in namespace {{ $labels.namespace }} has {{ $value | humanizePercentage }} free.` @@ -111,18 +106,6 @@ This page collects this repositories alerts and begins the process of describing ##### Alert Name: "KubeletTooManyPods" + *Message*: `Kubelet {{$labels.instance}} is running {{$value}} pods, close to the limit of 110.` + *Severity*: warning -##### Alert Name: "KubeAPILatencyHigh" -+ *Message*: `The API server has a 99th percentile latency of {{ $value }} seconds for {{$labels.verb}} {{$labels.resource}}.` -+ *Severity*: warning -##### Alert Name: "KubeAPILatencyHigh" -+ *Message*: `The API server has a 99th percentile latency of {{ $value }} seconds for {{$labels.verb}} {{$labels.resource}}.` -+ *Severity*: critical -##### Alert Name: "KubeAPIErrorsHigh" -+ *Message*: `API server is erroring for {{ $value | humanizePercentage }} of requests.` -+ *Severity*: critical -##### Alert Name: "KubeAPIErrorsHigh" -+ *Message*: `API server is erroring for {{ $value | humanizePercentage }} of requests.` -+ *Severity*: warning ##### Alert Name: "KubeClientCertificateExpiration" + *Message*: `A client certificate used to authenticate to the apiserver is expiring in less than 7 days.` + *Severity*: warning