diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml index befb6bb..00b3f76 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: 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== + 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== template: metadata: creationTimestamp: null diff --git a/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml index 7598598..89c0807 100644 --- a/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml +++ b/monitoring/manifests/prometheus-roleBindingSpecificNamespaces.yaml @@ -52,4 +52,17 @@ items: - kind: ServiceAccount name: prometheus-k8s namespace: monitoring +- apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + metadata: + name: prometheus-k8s + namespace: owntracks + roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: prometheus-k8s + subjects: + - kind: ServiceAccount + name: prometheus-k8s + namespace: monitoring kind: RoleBindingList diff --git a/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml b/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml index 730a3bd..6ae4062 100644 --- a/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/monitoring/manifests/prometheus-roleSpecificNamespaces.yaml @@ -64,4 +64,20 @@ items: - get - list - watch +- apiVersion: rbac.authorization.k8s.io/v1 + kind: Role + metadata: + name: prometheus-k8s + namespace: owntracks + rules: + - apiGroups: + - "" + resources: + - services + - endpoints + - pods + verbs: + - get + - list + - watch kind: RoleList diff --git a/monitoring/monitoring.jsonnet b/monitoring/monitoring.jsonnet index 4800eea..d4012ed 100644 --- a/monitoring/monitoring.jsonnet +++ b/monitoring/monitoring.jsonnet @@ -20,7 +20,7 @@ local kp = prometheus+:: { names: 'k8s', replicas: 1, - namespaces+: ['k8up'], + namespaces+: ['k8up', 'owntracks'], }, alertmanager+:: { replicas: 1,