From 8a7b72f7cd1ccd547a03eb4243294e741d661d3f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:30:37 +0100
Subject: Adding upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 collectors/python.d.plugin/ceph/ceph.chart.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'collectors/python.d.plugin/ceph/ceph.chart.py')

diff --git a/collectors/python.d.plugin/ceph/ceph.chart.py b/collectors/python.d.plugin/ceph/ceph.chart.py
index 31c764d0f..45b52620f 100644
--- a/collectors/python.d.plugin/ceph/ceph.chart.py
+++ b/collectors/python.d.plugin/ceph/ceph.chart.py
@@ -9,14 +9,13 @@ try:
 except ImportError:
     CEPH = False
 
-import os
 import json
+import os
+
 from bases.FrameworkServices.SimpleService import SimpleService
 
 # default module values (can be overridden per job in `config`)
 update_every = 10
-priority = 60000
-retries = 60
 
 ORDER = [
     'general_usage',
@@ -37,7 +36,7 @@ ORDER = [
 
 CHARTS = {
     'general_usage': {
-        'options': [None, 'Ceph General Space', 'KB', 'general', 'ceph.general_usage', 'stacked'],
+        'options': [None, 'Ceph General Space', 'KiB', 'general', 'ceph.general_usage', 'stacked'],
         'lines': [
             ['general_available', 'avail', 'absolute'],
             ['general_usage', 'used', 'absolute']
@@ -50,7 +49,7 @@ CHARTS = {
         ]
     },
     'general_bytes': {
-        'options': [None, 'Ceph General Read/Write Data/s', 'KB', 'general', 'ceph.general_bytes',
+        'options': [None, 'Ceph General Read/Write Data/s', 'KiB/s', 'general', 'ceph.general_bytes',
                     'area'],
         'lines': [
             ['general_read_bytes', 'read', 'absolute', 1, 1024],
@@ -74,7 +73,7 @@ CHARTS = {
         ]
     },
     'pool_usage': {
-        'options': [None, 'Ceph Pools', 'KB', 'pool', 'ceph.pool_usage', 'line'],
+        'options': [None, 'Ceph Pools', 'KiB', 'pool', 'ceph.pool_usage', 'line'],
         'lines': []
     },
     'pool_objects': {
@@ -82,11 +81,11 @@ CHARTS = {
         'lines': []
     },
     'pool_read_bytes': {
-        'options': [None, 'Ceph Read Pool Data/s', 'KB', 'pool', 'ceph.pool_read_bytes', 'area'],
+        'options': [None, 'Ceph Read Pool Data/s', 'KiB/s', 'pool', 'ceph.pool_read_bytes', 'area'],
         'lines': []
     },
     'pool_write_bytes': {
-        'options': [None, 'Ceph Write Pool Data/s', 'KB', 'pool', 'ceph.pool_write_bytes', 'area'],
+        'options': [None, 'Ceph Write Pool Data/s', 'KiB/s', 'pool', 'ceph.pool_write_bytes', 'area'],
         'lines': []
     },
     'pool_read_operations': {
@@ -98,7 +97,7 @@ CHARTS = {
         'lines': []
     },
     'osd_usage': {
-        'options': [None, 'Ceph OSDs', 'KB', 'osd', 'ceph.osd_usage', 'line'],
+        'options': [None, 'Ceph OSDs', 'KiB', 'osd', 'ceph.osd_usage', 'line'],
         'lines': []
     },
     'osd_apply_latency': {
@@ -320,7 +319,7 @@ class Service(SimpleService):
         return json.loads(self.cluster.mon_command(json.dumps({
             'prefix': 'osd df',
             'format': 'json'
-        }), '')[1])
+        }), '')[1].replace('-nan', '"-nan"'))
 
     def _get_osd_perf(self):
         """
-- 
cgit v1.2.3