Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
kube-prometheus
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
prometheus-operator
kube-prometheus
Commits
dbc64a03
Commit
dbc64a03
authored
3 years ago
by
paulfantom
Browse files
Options
Downloads
Patches
Plain Diff
jsonnet: do not hide alerting configuration
Signed-off-by:
paulfantom
<
pawel@krupa.net.pl
>
parent
31d86b79
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jsonnet/kube-prometheus/components/prometheus.libsonnet
+6
-6
6 additions, 6 deletions
jsonnet/kube-prometheus/components/prometheus.libsonnet
jsonnet/kube-prometheus/main.libsonnet
+8
-1
8 additions, 1 deletion
jsonnet/kube-prometheus/main.libsonnet
with
14 additions
and
7 deletions
jsonnet/kube-prometheus/components/prometheus.libsonnet
+
6
−
6
View file @
dbc64a03
...
@@ -2,20 +2,21 @@ local defaults = {
...
@@ -2,20 +2,21 @@ local defaults = {
local
defaults
=
self
,
local
defaults
=
self
,
// Convention: Top-level fields related to CRDs are public, other fields are hidden
// Convention: Top-level fields related to CRDs are public, other fields are hidden
// If there is no CRD for the component, everything is hidden in defaults.
// If there is no CRD for the component, everything is hidden in defaults.
name
::
error
'must provide name'
,
namespace
::
error
'must provide namespace'
,
namespace
::
error
'must provide namespace'
,
version
:
error
'must provide version'
,
version
:
error
'must provide version'
,
image
:
error
'must provide image'
,
image
:
error
'must provide image'
,
resources
:
{
resources
:
{
requests
:
{
memory
:
'400Mi'
},
requests
:
{
memory
:
'400Mi'
},
},
},
//TODO(paulfantom): remove alertmanagerName after release-0.10 and convert to plain 'alerting' object.
name
::
error
'must provide name'
,
alertmanagerName
::
''
,
//TODO: remove alertmanagerName and convert to plain 'alerting' object
alerting
:
{},
alertmanagerName
::
error
'must provide alertmanagerName'
,
namespaces
::
[
'default'
,
'kube-system'
,
defaults
.
namespace
],
namespaces
::
[
'default'
,
'kube-system'
,
defaults
.
namespace
],
replicas
:
2
,
replicas
:
2
,
externalLabels
:
{},
externalLabels
:
{},
enableFeatures
:
[],
enableFeatures
:
[],
ruleSelector
:
{},
commonLabels
::
{
commonLabels
::
{
'app.kubernetes.io/name'
:
'prometheus'
,
'app.kubernetes.io/name'
:
'prometheus'
,
'app.kubernetes.io/version'
:
defaults
.
version
,
'app.kubernetes.io/version'
:
defaults
.
version
,
...
@@ -27,7 +28,6 @@ local defaults = {
...
@@ -27,7 +28,6 @@ local defaults = {
for
labelName
in
std
.
objectFields
(
defaults
.
commonLabels
)
for
labelName
in
std
.
objectFields
(
defaults
.
commonLabels
)
if
!
std
.
setMember
(
labelName
,
[
'app.kubernetes.io/version'
])
if
!
std
.
setMember
(
labelName
,
[
'app.kubernetes.io/version'
])
}
+
{
prometheus
:
defaults
.
name
},
}
+
{
prometheus
:
defaults
.
name
},
ruleSelector
:
{},
mixin
::
{
mixin
::
{
ruleLabels
:
{},
ruleLabels
:
{},
_config
:
{
_config
:
{
...
@@ -273,7 +273,7 @@ function(params) {
...
@@ -273,7 +273,7 @@ function(params) {
serviceMonitorNamespaceSelector
:
{},
serviceMonitorNamespaceSelector
:
{},
nodeSelector
:
{
'kubernetes.io/os'
:
'linux'
},
nodeSelector
:
{
'kubernetes.io/os'
:
'linux'
},
resources
:
p
.
_config
.
resources
,
resources
:
p
.
_config
.
resources
,
alerting
:
{
alerting
:
if
p
.
_config
.
alerting
!
=
{}
then
p
.
_config
.
alerting
else
{
alertmanagers
:
[{
alertmanagers
:
[{
namespace
:
p
.
_config
.
namespace
,
namespace
:
p
.
_config
.
namespace
,
name
:
'alertmanager-'
+
p
.
_config
.
alertmanagerName
,
name
:
'alertmanager-'
+
p
.
_config
.
alertmanagerName
,
...
...
This diff is collapsed.
Click to expand it.
jsonnet/kube-prometheus/main.libsonnet
+
8
−
1
View file @
dbc64a03
...
@@ -91,7 +91,14 @@ local utils = import './lib/utils.libsonnet';
...
@@ -91,7 +91,14 @@ local utils = import './lib/utils.libsonnet';
version
:
$
.
values
.
common
.
versions
.
prometheus
,
version
:
$
.
values
.
common
.
versions
.
prometheus
,
image
:
$
.
values
.
common
.
images
.
prometheus
,
image
:
$
.
values
.
common
.
images
.
prometheus
,
name
:
'k8s'
,
name
:
'k8s'
,
alertmanagerName
:
$
.
values
.
alertmanager
.
name
,
alerting
:
{
alertmanagers
:
[{
namespace
:
$
.
values
.
common
.
namespace
,
name
:
'alertmanager-'
+
$
.
values
.
alertmanager
.
name
,
port
:
$
.
alertmanager
.
service
.
spec
.
ports
[
0
].
name
,
apiVersion
:
'v2'
,
}],
},
mixin
+:
{
ruleLabels
:
$
.
values
.
common
.
ruleLabels
},
mixin
+:
{
ruleLabels
:
$
.
values
.
common
.
ruleLabels
},
},
},
prometheusAdapter
:
{
prometheusAdapter
:
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment