RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36315 from p-se/fix-monitoring-images-ceph-salt

Browse Source 
cephadm: deploying of monitoring images partially broken

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
This commit is contained in:
Sebastian Wagner 2020-08-26 13:28:00 +02:00 committed by GitHub
commit 8954dfba07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cephadm/cephadm
View File

@ -129,7 +129,7 @@ class Monitoring(object):
components = {
"prometheus": {
"image": "prom/prometheus:latest",
"image": "docker.io/prom/prometheus:v2.18.1",
"cpus": '2',
"memory": '4GB',
"args": [
@ -142,7 +142,7 @@ class Monitoring(object):
],
},
"node-exporter": {
"image": "prom/node-exporter",
"image": "docker.io/prom/node-exporter:v0.18.1",
"cpus": "1",
"memory": "1GB",
"args": [
@ -150,7 +150,7 @@ class Monitoring(object):
],
},
"grafana": {
"image": "ceph/ceph-grafana:latest",
"image": "docker.io/ceph/ceph-grafana:6.6.2",
"cpus": "2",
"memory": "4GB",
"args": [],
@ -162,7 +162,7 @@ class Monitoring(object):
],
},
"alertmanager": {
"image": "prom/alertmanager",
"image": "docker.io/prom/alertmanager:v0.20.0",
"cpus": "2",
"memory": "2GB",
"args": [],

8
src/pybind/mgr/cephadm/module.py
View File

@ -151,22 +151,22 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
},
{
'name': 'container_image_prometheus',
'default': 'prom/prometheus:v2.18.1',
'default': 'docker.io/prom/prometheus:v2.18.1',
'desc': 'Prometheus container image',
},
{
'name': 'container_image_grafana',
'default': 'ceph/ceph-grafana:6.6.2',
'default': 'docker.io/ceph/ceph-grafana:6.6.2',
'desc': 'Prometheus container image',
},
{
'name': 'container_image_alertmanager',
'default': 'prom/alertmanager:v0.20.0',
'default': 'docker.io/prom/alertmanager:v0.20.0',
'desc': 'Prometheus container image',
},
{
'name': 'container_image_node_exporter',
'default': 'prom/node-exporter:v0.18.1',
'default': 'docker.io/prom/node-exporter:v0.18.1',
'desc': 'Prometheus container image',
},
{