Skip to content

mgr/cephadm: use fixed Grafana version#35593

Merged
sebastian-philipp merged 1 commit intoceph:masterfrom
p-se:wip-pse-cephadm-grafana-fix-version
Jun 25, 2020
Merged

mgr/cephadm: use fixed Grafana version#35593
sebastian-philipp merged 1 commit intoceph:masterfrom
p-se:wip-pse-cephadm-grafana-fix-version

Conversation

@p-se
Copy link
Contributor

@p-se p-se commented Jun 16, 2020 •
edited
Loading

Fixes: https://tracker.ceph.com/issues/45859

Signed-off-by: Patrick Seidensal pseidensal@suse.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@p-se
mgr/cephadm: use fixed Grafana version
5719605 
Fixes: https://tracker.ceph.com/issues/45859

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
@p-se p-se requested review from a team and sebastian-philipp June 16, 2020 11:01
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 16, 2020 •
edited
Loading

would it make sense to also remove the (wrong) defaults in

ceph/src/cephadm/cephadm

Line 122 in 38e79b6

"image": "prom/prometheus:latest",

ceph/src/cephadm/cephadm

Line 135 in 38e79b6

"image": "prom/node-exporter",

ceph/src/cephadm/cephadm

Line 143 in 38e79b6

"image": "ceph/ceph-grafana:latest",

and

ceph/src/cephadm/cephadm

Line 155 in 38e79b6

"image": "prom/alertmanager",

?

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 17, 2020

green: http://pulpito.ceph.com/swagner-2020-06-17_12:51:58-rados:cephadm-wip-swagner3-testing-2020-06-17-1045-distro-basic-smithi/

@p-se
Copy link
Contributor Author

p-se commented Jun 22, 2020

would it make sense to also remove the (wrong) defaults in

ceph/src/cephadm/cephadm

Line 122 in 38e79b6

"image": "prom/prometheus:latest",

ceph/src/cephadm/cephadm

Line 135 in 38e79b6

"image": "prom/node-exporter",

ceph/src/cephadm/cephadm

Line 143 in 38e79b6

"image": "ceph/ceph-grafana:latest",

and

ceph/src/cephadm/cephadm

Line 155 in 38e79b6

"image": "prom/alertmanager",

?

I'm not sure about that and don't have a strong opinion. src/cephadm/cephadm will probably ever only be used directly by developers who want to try out or debug something. It might make sense to deploy the same versions there which we support in mgr/cephadm. It might as well make sense to deploy the latest version, I don't know.

But if we decide to keep both versions in sync, we would actually want a unique source where both components take the versions from, which we cannot do as src/cephadm/cephadm is required to run as stand-alone as possible.

Do you have a tendency into any direction?

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 24, 2020

greenish: http://pulpito.ceph.com/swagner-2020-06-24_11:30:44-rados:cephadm-wip-swagner3-testing-2020-06-24-1025-distro-basic-smithi/

Failed, cause I don't know if the upgrade actually works

@sebastian-philipp sebastian-philipp changed the title mgr/cephadm: use fixed Grafana version [blocked by #35740] mgr/cephadm: use fixed Grafana version Jun 24, 2020
@sebastian-philipp sebastian-philipp added the wip-swagner-testing My Teuthology tests label Jun 25, 2020
@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 25, 2020

green: http://pulpito.ceph.com/swagner-2020-06-25_13:58:46-rados:cephadm-wip-swagner-testing-2020-06-25-1435-distro-basic-smithi/

@sebastian-philipp sebastian-philipp changed the title [blocked by #35740] mgr/cephadm: use fixed Grafana version mgr/cephadm: use fixed Grafana version Jun 25, 2020
@sebastian-philipp sebastian-philipp merged commit a27334c into ceph:master Jun 25, 2020
@sebastian-philipp sebastian-philipp mentioned this pull request Jul 2, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@sebastian-philipp sebastian-philipp sebastian-philipp approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

cephadm monitoring wip-swagner-testing My Teuthology tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@p-se @sebastian-philipp