RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: simplify Monitoring.components structure

Browse Source 
by removing the nested image/metadata dict

Signed-off-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Michael Fritch 2020-01-31 08:14:29 -07:00
parent 324c6cc10b
commit c37504e81c
No known key found for this signature in database
GPG Key ID: 75F3EB2E80A03B7F
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/cephadm/cephadm
View File

@ -96,37 +96,31 @@ class Monitoring(object):
components = {
"prometheus": {
"image": {
"image": "prom/prometheus:latest",
"cpus": '2',
"memory": '4GB',
"args": [
"--config.file=/etc/prometheus/prometheus.yml",
"--storage.tsdb.path=/prometheus",
"--web.listen-address=:{}".format(port_map['prometheus']),
]
},
"image": "prom/prometheus:latest",
"cpus": '2',
"memory": '4GB',
"args": [
"--config.file=/etc/prometheus/prometheus.yml",
"--storage.tsdb.path=/prometheus",
"--web.listen-address=:{}".format(port_map['prometheus']),
],
"config-json": [
"prometheus.yml",
],
},
"node-exporter": {
"image": {
"image": "prom/node-exporter",
"cpus": "1",
"memory": "1GB",
"args": [
"--no-collector.timex",
],
}
"image": "prom/node-exporter",
"cpus": "1",
"memory": "1GB",
"args": [
"--no-collector.timex",
],
},
"grafana": {
"image": {
"image": "pcuzner/ceph-grafana-el8:latest",
"cpus": "2",
"memory": "4GB",
"args": [],
},
"image": "pcuzner/ceph-grafana-el8:latest",
"cpus": "2",
"memory": "4GB",
"args": [],
"config-json": [
"grafana.ini",
"provisioning/datasources/ceph-dashboard.yml",
@ -885,8 +879,7 @@ def get_daemon_args(fsid, daemon_type, daemon_id):
'--default-mon-cluster-log-to-stderr=true',
]
elif daemon_type in Monitoring.components:
component = Monitoring.components[daemon_type]
metadata = component.get('image', list())
metadata = Monitoring.components[daemon_type]
r += metadata.get('args', list())
return r
@ -1986,10 +1979,9 @@ def command_deploy():
uid, gid = extract_uid_gid(file_path='/var/lib/grafana')
else:
raise Error("{} not implemented yet".format(daemon_type))
# Monitoring metadata is nested dicts, so asking mypy to ignore
m = Monitoring.components[daemon_type]
metadata = m.get('image', dict())
metadata = Monitoring.components[daemon_type]
monitoring_args = [
'--user',
str(uid),