Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions jsonnetfile.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
"version": "91201b1a0236a7e9af8c9216db14d609240617ff",
"version": "5acaf85058d3e68a72c9837b4740d0775db6b69a",
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
},
{
Expand Down Expand Up @@ -59,7 +59,7 @@
"subdir": "gen/grafonnet-latest"
}
},
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
"sum": "V9vAj21qJOc2DlMPDgB1eEjSQU4A+sAA4AXuJ6bd4xc="
},
{
Expand All @@ -69,7 +69,7 @@
"subdir": "gen/grafonnet-v10.0.0"
}
},
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
},
{
Expand All @@ -79,7 +79,7 @@
"subdir": "gen/grafonnet-v11.4.0"
}
},
"version": "42d098fae987f25f08480e203ca6ddc548c6efbf",
"version": "8a27651b56fbdba45a389ccb11440200091c73a1",
"sum": "aVAX09paQYNOoCSKVpuk1exVIyBoMt/C50QJI+Q/3nA="
},
{
Expand All @@ -89,8 +89,8 @@
"subdir": "grafana-builder"
}
},
"version": "d9709a268f70932be2ba0a5728f01e7f833930e5",
"sum": "dr3ok/KQ0aNc/U+CxO5hlHFuP66z1IlsnthKeE+m/ss="
"version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552",
"sum": "d8iL8gbyQxspZJ8mDGsqHRR/JF3cu+YOaV50vao93Nw="
},
{
"source": {
Expand All @@ -99,7 +99,7 @@
"subdir": "mixin-utils"
}
},
"version": "d9709a268f70932be2ba0a5728f01e7f833930e5",
"version": "d1eede9462c03d44dcd4a707aa8e7dcaf155a552",
"sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
},
{
Expand Down Expand Up @@ -139,7 +139,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
"version": "807f8bd184ed4325c1a04214039bb0bd51e1878e",
"version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73",
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
},
{
Expand All @@ -149,7 +149,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
"version": "807f8bd184ed4325c1a04214039bb0bd51e1878e",
"version": "9ea375226bc72c0283bd0d35a7d4b3e399749b73",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
Expand All @@ -159,8 +159,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "5a769e33bf43c38d948c6bea8aca45599445be0a",
"sum": "omXCBuv4xqc5feTGkX7ElQmQ3fjhyteHrLKXP/51trE="
"version": "2e016283f2505a99ed03687b36d41d3e9dd5c49f",
"sum": "ky9yNtgZxHDmXiygPo6pJl1GzBOiRfuGKmUEeiv+0rA="
},
{
"source": {
Expand All @@ -169,7 +169,7 @@
"subdir": "jsonnet/mixin"
}
},
"version": "b128cbb2b962cc92870af7a094579bf9a0f50a76",
"version": "0ff52b38b82db983c210eae0147d7d675a23ca70",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
Expand All @@ -180,8 +180,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "b128cbb2b962cc92870af7a094579bf9a0f50a76",
"sum": "igLre3CTwKz4/zEMHlZxL7NkcQXE8AKkVfr9QqIvJPw="
"version": "0ff52b38b82db983c210eae0147d7d675a23ca70",
"sum": "H2UtUOnr9WTkyyLPJL91T+mgmSjRh3yT0UBos4J3jsI="
},
{
"source": {
Expand All @@ -190,7 +190,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
"version": "2e0970e8d8191f6fb7df6fb625f236bad5aa759a",
"version": "e542c68a6bc1a2f3ad187cb6b4db8dd925816520",
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
"name": "alertmanager"
},
Expand All @@ -201,7 +201,7 @@
"subdir": "docs/node-mixin"
}
},
"version": "819c3705973b179c03896c2ab4d9af0bd7c35575",
"version": "b306b639e1c81dfd6e142d5415a85b37c9f1c195",
"sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
},
{
Expand All @@ -211,7 +211,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "4aa8941eb186264e570ee76eda8b23ff8989abc5",
"version": "d0d2699dc5f454ebca53e56247281447f8dd8c5a",
"sum": "UuADJwhNploRwfJYGb0sr2mi+MvswKpumoOMXnGs0Dc=",
"name": "prometheus"
},
Expand All @@ -222,7 +222,7 @@
"subdir": "jsonnet/controller-gen"
}
},
"version": "fc08b8858998a8488a8ac2cd23810b4da7223d53",
"version": "6f16e091a98c44792808d238f1b7db1a97ead23a",
"sum": "xUGxDjMr7V/SpY21Xsr0X3ve/a04du3pRlbrA3I/Uk8=",
"name": "pyrra"
},
Expand All @@ -233,7 +233,7 @@
"subdir": "mixin"
}
},
"version": "1473450480ec2fd9485336dd7a460a7c86b87ff4",
"version": "b3b08ef8d13538b603f0a7af917ccb6960a71b7e",
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
"name": "thanos-mixin"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down Expand Up @@ -4816,6 +4816,11 @@ spec:
message defines the notification message content.
This is the main body text of the Pushover notification.
type: string
monospace:
description: |-
monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
html and monospace formatting are mutually exclusive.
type: boolean
priority:
description: |-
priority defines the notification priority level.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down Expand Up @@ -6766,10 +6766,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down Expand Up @@ -5287,10 +5287,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: Replace=true
controller-gen.kubebuilder.io/version: v0.19.0
operator.prometheus.io/version: 0.86.2
operator.prometheus.io/version: 0.87.0
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
Expand Down Expand Up @@ -4641,10 +4641,12 @@ spec:
Cannot be set at the same time as `oauth` or `sdk`.
properties:
clientId:
description: clientId defines defines the Azure User-assigned Managed identity.
description: |-
clientId defines the Azure User-assigned Managed identity.

For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
minLength: 1
type: string
required:
- clientId
type: object
oauth:
description: |-
Expand Down
2 changes: 1 addition & 1 deletion monitoring-satellite/manifests/grafana/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 12.2.1
app.kubernetes.io/version: 12.3.0
name: grafana-config
namespace: monitoring-satellite
stringData:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
app.kubernetes.io/version: 12.2.1
app.kubernetes.io/version: 12.3.0
name: grafana-datasources
namespace: monitoring-satellite
stringData:
Expand Down
Loading