Commit Graph

71 Commits

Author SHA1 Message Date
Dan Mick
de491c128a monitoring/grafana/build/Makefile: work around buildah bug
Workaround https://github.com/containers/buildah/issues/3253
by pushing to a local OCI-format image to clear out erroneously-left
'parent' field in buildah commit --squash output.  Can be removed
when the fix for the above is available.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
b56ff43232 monitoring/grafana/build/Makefile: use --authfile
podman login caches auth tokens in auth.json; for sudo, it may be
placed in /run/containers/0 or it may be in /run/users/0/containers;
the latter directory is removed when root "logs out", which isn't
clear what it means with sudo/su.  Several builds failed because
they couldn't find the cached auth between sudo podman login and sudo
podman push.  Sidestep the confusion by just using a local file for
the auth cache.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
a3b4bc73f7 monitoring/grafana/build/Makefile: cleanup, ready for jenkins
- allow env setting of versions of components
- add docker/quay username/password variables
- derive container version from grafana version
- make arch-specific tags
- expand clean target to remove container images
- remove release-specific targets, "all" target
- move push operations to separate "push" target

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
0fdbe673c8 monitoring/grafana/build/Makefile: use curl instead of wget
build machines tend to already have curl installed

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
2faadc2d5c monitoring/grafana/build/Makefile: use "sudo buildah"
Some build machines don't have /etc/sub{u,g}id set up for
so-called "rootless" (non-privileged) operation.  Use sudo
to avoid the need for "rootless".

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
9d37c6efbd monitoring/grafana/build/Makefile: pull dashboards from local dir
Use the dashboard definition files in this workspace directly

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
444d6f6623 monitoring/grafana/build/Makefile: Add ARCH variable
Allow building for other archs, in particular arm64

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:25 -07:00
Dan Mick
508b1d387f monitoring/grafana/build/Makefile: fully qualify source image
Some build machines may not have a default docker repo configured.
Specify docker.io.

Signed-off-by: Dan Mick <dmick@redhat.com>
2021-05-26 13:37:24 -07:00
Ernesto Puerta
ac5d24e5ca
mgr/dashboard: remove non-null id in Grafana dashb
Testing added to prevent this situation.

Fixes: https://tracker.ceph.com/issues/50918
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2021-05-21 13:54:48 +02:00
Alfonso Martínez
7d79efb025 mgr/dashboard: fix OSDs Host details/overview grafana graphs
Fixes: https://tracker.ceph.com/issues/50686
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2021-05-07 15:38:07 +02:00
Ernesto Puerta
458ad48024
Merge pull request #40715 from pcuzner/pool-overview-enhancement
mgr/dashboard:include compression stats on pool dashboard

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2021-05-05 18:08:58 +02:00
Paul Cuzner
81788b1f21 mgr/dashboard:include compression stats on pool dashboard
This is a replacement dashboard configuration for the
pool overview page. It provides a cluster wide view of
capacity consumed and compression effectiveness, and
breaks this down by each pool within the configuration.

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

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2021-05-03 12:26:06 +12:00
Ernesto Puerta
381685f17f
Merge pull request #40072 from wornet-mwo/dashboard--grafana-hostname-corrections
mgr/dashboard: Fixed name clash when hostname similar to another

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
2021-04-29 19:40:57 +02:00
Michael Wodniok
e97e27ebdb dashboard: Fixed name clash when hostname similar to anaother
Fixes: #49769
Signed-off-by: Michael Wodniok <wodniok@wor.net>
2021-04-27 08:42:59 +02:00
Malcolm Holmes
382e293656 monitoring/grafana: Remove erroneous elements in hosts-overview Grafana dashboard
The hosts-overview Grafana dashboard json file contains a repeated element, making
it invalid JSON. Some JSON parsers handle this. However, this prevents Jsonnet
from parsing the dashboard, which prevents the deployment of this dashboard via
Jsonnet.

Fixes: https://tracker.ceph.com/issues/50410
Signed-off-by: Malcolm Holmes <mdh@odoko.co.uk>
2021-04-17 23:11:48 +01:00
Alfonso Martínez
9441fda4dc mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379
Fixes: https://tracker.ceph.com/issues/48685
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2021-01-07 16:53:26 +01:00
haoyixing
0e7e036aa7 doc/dev: use http://docs.ceph.com/en/latest/ instead of /docs/master/ for docs
Several links under http://docs.ceph.com/docs/master/ were unable to access.
Change them to http://docs.ceph.com/en/lastest so we can access them directly.

Signed-off-by: haoyixing <haoyixing@kuaishou.com>
2020-11-24 12:49:47 +08:00
Seena Fallah
0fd28f646c monitoring: Use null yaxes min for OSD read latency
According to seriesOverrides that negative-Y for read param there shouldn't be a minimum for yaxes

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
2020-10-12 19:56:18 +03:30
Patrick Seidensal
fe64b9d176 mgr/dashboard: Fix many-to-many issue in host-details dashboard
The labels on one side do not match the labels of the other side, where
a label_replace is used. The fix uses the same label_replace on the
missing side.

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

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-09-07 12:37:40 +02:00
Avan Thakkar
f039e5585d mgr/dashboard: cpu stats incorrectly displayed
Fixes: https://tracker.ceph.com/issues/46683

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2020-07-23 11:57:32 +05:30
pcuzner
0021dd278b
Merge pull request #35610 from pcuzner/wip-grafana-container
monitoring: add grafana container build file
2020-07-06 13:06:55 +12:00
Lenz Grimmer
399521d66b
Merge pull request #34532 from rhcs-dashboard/wip-45068-fix-parse-error
mgr/dashboard: Prometheus query error in the metrics of Pools, OSDs and RBD images

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-06-30 10:50:59 +02:00
Paul Cuzner
3c813729dc monitoring:add grafama container build file
This commit provides the Makefile to create the
ceph-grafana containers for nautilus, octopus and
master releases.

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2020-06-17 17:20:45 +12:00
Kiefer Chang
b963b7fbe9
monitoring: fixing some issues in RBD detail dashboard
- Exchange read/write legends in The `I/O Bytes per second` panel.
- Rename `I/O Bytes per second` to `Throughput`.
- Rename `IOPS Count` to just `IOPS`.
- Remove instance name from legends.
- Fixes typos: `Averange` -> `Average`.

Fixes: https://tracker.ceph.com/issues/45735
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
2020-05-28 14:49:31 +08:00
Alfonso Martínez
cf4ff7d2f0 mgr/dashboard: grafana panels for rgw multisite sync performance
* RGW sync perf. counters are now exposed through grafana panels.
* Sync Performance tab is only shown if rgw realm is detected.
* Prometheus module: added metrics suitable for prometheus consumption (from existing ones, not replacing for backward compatibility).

Fixes: https://tracker.ceph.com/issues/45310
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2020-05-22 13:36:10 +02:00
Lenz Grimmer
9334471340
Merge pull request #33991 from SchoolGuy/monitoring/rbd-image-details
mgr/dashboard/grafana: Add rbd-image details dashboard

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2020-05-04 09:59:53 +02:00
Enno Gotthold
dfb1e0020e
mgr/dashboard: Remove additional unneeded steps for the metrics calculation
Signed-off-by: Enno Gotthold <egotthold@suse.de>
2020-04-28 13:34:16 +02:00
Ernesto Puerta
3fd804f10b
monitoring: fix decimal precision in Grafana %
Set decimal precision to 2 positions for charts using percentunits.

Fixes: https://tracker.ceph.com/issues/45183
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2020-04-22 13:39:16 +02:00
Avan Thakkar
47b515c094 mgr/dashboard: Prometheus query error in the metrics of Pools, OSDs and RBD images
Fixes: https://tracker.ceph.com/issues/45068

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2020-04-21 23:03:09 +05:30
Lenz Grimmer
b6ad9a804b
Merge pull request #34240 from krig/grafana-dashboards-fixes
mgr/dashboard: Repair broken grafana panels

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2020-04-06 10:55:20 +02:00
Kristoffer Grönlund
b7abaab5bd dashboard: Convert FQDN to hostname in grafana panels
The $ceph_hosts variable contained the FQDN for hosts
while the instance label created by ceph only has
the hostname.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:15 +01:00
Kristoffer Grönlund
136d21e21d dashboard: Resolve FQDN / hostname mismatch in hosts overview panel
In the AVG Disk Utilization panel, the result is calculated
by combining the output of node_disk_io_time_seconds_total
with the output of ceph_disk_occupation. However, the
first vector encodes the instance label with the full FQDN
while the ceph label only contains the hostname:port. In
order for these to match correctly, the domain name and port
has to be stripped from the labels.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:09 +01:00
Kristoffer Grönlund
8b61b8d3d7 dashboard: Use exported_instance to identify OSDs
When moving to LVM-based ceph-volume setups, several
grafana dashboards stopped working. The problem is that
(device, instance) no longer results in unique labels
which causes errors like:

"many-to-many matching not allowed: matching labels must be unique on one side"

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:01 +01:00
Kristoffer Grönlund
4444333243 dashboard: AVG RAM Utilization panel always showed "N/A"
The references to `$osd_hosts` etc. were encoded as
`[[osd_hosts]]` in the PromQL expression divisor, and
the panel always displayed N/A as the result of the
query.

Replacing the `[[...]]` with `$...` makes the expression
work again.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:32:52 +01:00
Kefu Chai
a12f9f19e0
Merge pull request #32749 from james58899/fix-capacity
monitoring: Fix pool capacity incorrect

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2020-03-27 16:13:29 +08:00
Enno Gotthold
9707cb30cb
mgr/dashboard: Add grafana chart for rbd image details
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>

This dashboard will per default be empty as the already existing
dashboard with the summary for all rbd images.
2020-03-26 08:21:30 +01:00
Alfonso Martínez
1f0cddfafc monitoring: fix RGW grafana chart 'Average GET/PUT Latencies'
Fixes: https://tracker.ceph.com/issues/44538
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2020-03-10 12:05:26 +01:00
James Cheng
1b980ef88c
monitoring: Fix pool capacity incorrect
Signed-off-by: James Cheng <james59988@gmail.com>
2020-02-18 19:19:13 +08:00
Avan Thakkar
dd8cb9d2d6 mgr/dashboard: UI fixes
Fixes: https://tracker.ceph.com/issues/42914

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
2020-02-10 22:57:57 +05:30
Aleksei Zakharov
a37cf380ad mgr/grafana: sum pg states for cluster
Also, revert table formatting.

Signed-off-by: Aleksei Zakharov <zaharov@selectel.ru>
2020-01-29 17:28:36 +03:00
Aleksei Zakharov
4eb58f7ccc monitoring/grafana,prometheus: add per-pool pg states support
Signed-off-by: Aleksei Zakharov <zaharov@selectel.ru>
2020-01-29 17:28:36 +03:00
Bryan Stillwell
8eafb09acb Switch spelling of utilization
Prefer the non-British spelling of utilization since that's what the majority
of the code base seems to use.

Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
2020-01-07 16:57:36 -07:00
Lenz Grimmer
11a1708e19
mgr/dashboard: grafana charts match time picker selection. (#31964)
mgr/dashboard: grafana charts match time picker selection.

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
2019-12-03 17:09:00 +00:00
Alfonso Martínez
5ba114330e mgr/dashboard: grafana charts match time picker selection.
Fixes: https://tracker.ceph.com/issues/43097
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2019-12-03 14:15:10 +01:00
Ernesto Puerta
1182073f0c
mgr/dashboard,grafana: remove shortcut menu
Remove shortcut menu (links) and add check in grafana CI script.

Fixes: https://tracker.ceph.com/issues/43091
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2019-12-03 10:21:35 +01:00
Radu Toader
3beaf63761
mgr/dashboard: fix grafana dashboards
Fixes: https://tracker.ceph.com/issues/42542

Sort order was wrong for some dashboards,
fixed empty / buggy Top 3 clients IOPS by pool / Throughput - in Pools
Overall performance
fixed Avg utilization Multiple series found - in Host Overall
performance
Fixed invalid dimensions for plot - in OSD Overall performance

Signed-off-by: Radu Toader <radu.m.toader@gmail.com>
2019-10-30 11:03:03 +02:00
Jan Fajerski
e7a4437fdc monitoring: update Grafana dashboards
Fix various panels that used outdated metric names, cluncky or
unnecessary label_replace calls. Also unify the style of many panels.

Fixes: http://tracker.ceph.com/issues/39652

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-05-14 13:47:55 +02:00
Jan Fajerski
287e209351 monitoring/grafana: fix typo in README
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-04-16 14:19:51 +02:00
Neha Gupta
739fdbad37 mgr/dashboard: Fixed performance details context for host list row selection
Fixes: http://tracker.ceph.com/issues/37854

Signed-off-by: Neha Gupta <gnehapk@gmail.com>
2019-01-18 13:36:49 +09:00
Jason Dillaman
f4ac899950 monitoring/grafana: new RBD overview dashboard page
This page pulls RBD stats from the Natuatilus prometheus exporter.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-01-11 16:41:46 -05:00