Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
dc429dd8
Commit
dc429dd8
authored
Dec 20, 2019
by
Hordur Freyr Yngvason
Committed by
Dmitriy Zaporozhets
Dec 20, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update prometheus chart version to 9.5.2
This should only affect new installations.
parent
7a8057fd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
app/models/clusters/applications/prometheus.rb
app/models/clusters/applications/prometheus.rb
+1
-1
changelogs/unreleased/update-prometheus-chart.yml
changelogs/unreleased/update-prometheus-chart.yml
+5
-0
spec/models/clusters/applications/prometheus_spec.rb
spec/models/clusters/applications/prometheus_spec.rb
+3
-3
vendor/prometheus/values.yaml
vendor/prometheus/values.yaml
+0
-4
No files found.
app/models/clusters/applications/prometheus.rb
View file @
dc429dd8
...
@@ -5,7 +5,7 @@ module Clusters
...
@@ -5,7 +5,7 @@ module Clusters
class
Prometheus
<
ApplicationRecord
class
Prometheus
<
ApplicationRecord
include
PrometheusAdapter
include
PrometheusAdapter
VERSION
=
'
6.7.3
'
VERSION
=
'
9.5.2
'
self
.
table_name
=
'clusters_applications_prometheus'
self
.
table_name
=
'clusters_applications_prometheus'
...
...
changelogs/unreleased/update-prometheus-chart.yml
0 → 100644
View file @
dc429dd8
---
title
:
Update prometheus chart version to 9.5.2
merge_request
:
21935
author
:
type
:
changed
spec/models/clusters/applications/prometheus_spec.rb
View file @
dc429dd8
...
@@ -130,7 +130,7 @@ describe Clusters::Applications::Prometheus do
...
@@ -130,7 +130,7 @@ describe Clusters::Applications::Prometheus do
it
'is initialized with 3 arguments'
do
it
'is initialized with 3 arguments'
do
expect
(
subject
.
name
).
to
eq
(
'prometheus'
)
expect
(
subject
.
name
).
to
eq
(
'prometheus'
)
expect
(
subject
.
chart
).
to
eq
(
'stable/prometheus'
)
expect
(
subject
.
chart
).
to
eq
(
'stable/prometheus'
)
expect
(
subject
.
version
).
to
eq
(
'
6.7.3
'
)
expect
(
subject
.
version
).
to
eq
(
'
9.5.2
'
)
expect
(
subject
).
to
be_rbac
expect
(
subject
).
to
be_rbac
expect
(
subject
.
files
).
to
eq
(
prometheus
.
files
)
expect
(
subject
.
files
).
to
eq
(
prometheus
.
files
)
end
end
...
@@ -147,7 +147,7 @@ describe Clusters::Applications::Prometheus do
...
@@ -147,7 +147,7 @@ describe Clusters::Applications::Prometheus do
let
(
:prometheus
)
{
create
(
:clusters_applications_prometheus
,
:errored
,
version:
'2.0.0'
)
}
let
(
:prometheus
)
{
create
(
:clusters_applications_prometheus
,
:errored
,
version:
'2.0.0'
)
}
it
'is initialized with the locked version'
do
it
'is initialized with the locked version'
do
expect
(
subject
.
version
).
to
eq
(
'
6.7.3
'
)
expect
(
subject
.
version
).
to
eq
(
'
9.5.2
'
)
end
end
end
end
...
@@ -218,7 +218,7 @@ describe Clusters::Applications::Prometheus do
...
@@ -218,7 +218,7 @@ describe Clusters::Applications::Prometheus do
it
'is initialized with 3 arguments'
do
it
'is initialized with 3 arguments'
do
expect
(
patch_command
.
name
).
to
eq
(
'prometheus'
)
expect
(
patch_command
.
name
).
to
eq
(
'prometheus'
)
expect
(
patch_command
.
chart
).
to
eq
(
'stable/prometheus'
)
expect
(
patch_command
.
chart
).
to
eq
(
'stable/prometheus'
)
expect
(
patch_command
.
version
).
to
eq
(
'
6.7.3
'
)
expect
(
patch_command
.
version
).
to
eq
(
'
9.5.2
'
)
expect
(
patch_command
.
files
).
to
eq
(
prometheus
.
files
)
expect
(
patch_command
.
files
).
to
eq
(
prometheus
.
files
)
end
end
end
end
...
...
vendor/prometheus/values.yaml
View file @
dc429dd8
alertmanager
:
alertmanager
:
enabled
:
false
enabled
:
false
image
:
tag
:
v0.15.2
kubeStateMetrics
:
kubeStateMetrics
:
enabled
:
true
enabled
:
true
...
@@ -14,8 +12,6 @@ pushgateway:
...
@@ -14,8 +12,6 @@ pushgateway:
server
:
server
:
fullnameOverride
:
"
prometheus-prometheus-server"
fullnameOverride
:
"
prometheus-prometheus-server"
image
:
tag
:
v2.4.3
serverFiles
:
serverFiles
:
alerts
:
{}
alerts
:
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment