X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=python.d%2Fipfs.chart.py;h=eaea3c5eec69bbe34036c5dc5008f3b275ce0bd9;hb=0a773d0ce3377451cde05d8f3981649715f9869b;hp=89c7fbf6e040f66cbe1a75fe1a50343fb4948de8;hpb=642dc0ec79cb871f8f0f4e914af87e054409008f;p=netdata.git

diff --git a/python.d/ipfs.chart.py b/python.d/ipfs.chart.py
index 89c7fbf6..eaea3c5e 100644
--- a/python.d/ipfs.chart.py
+++ b/python.d/ipfs.chart.py
@@ -34,9 +34,10 @@ CHARTS = {
             ["peers", None, 'absolute']
         ]},
     'repo_size': {
-        'options': [None, 'IPFS Repo Size', 'MB', 'Size', 'ipfs.repo_size', 'line'],
+        'options': [None, 'IPFS Repo Size', 'GB', 'Size', 'ipfs.repo_size', 'area'],
         'lines': [
-            ["size", None, "absolute", 1, 1000000]
+            ["avail", None, "absolute", 1, 1e9],
+            ["size", None, "absolute", 1, 1e9],
         ]},
     'repo_objects': {
         'options': [None, 'IPFS Repo Objects', 'objects', 'Objects', 'ipfs.repo_objects', 'line'],
@@ -47,6 +48,10 @@ CHARTS = {
         ]},
 }
 
+SI_zeroes = {'k': 3, 'm': 6, 'g': 9, 't': 12,
+             'p': 15, 'e': 18, 'z': 21, 'y': 24 }
+
+
 class Service(UrlService):
     def __init__(self, configuration=None, name=None):
         UrlService.__init__(self, configuration=configuration, name=name)
@@ -56,35 +61,55 @@ class Service(UrlService):
             self.baseurl = "http://localhost:5001"
         self.order = ORDER
         self.definitions = CHARTS
+        self.__storagemax = None
 
     def _get_json(self, suburl):
         """
         :return: json decoding of the specified url
-        """ 
+        """
         self.url = self.baseurl + suburl
         try:
-            return json.loads(self._get_raw_data()) 
+            return json.loads(self._get_raw_data())
         except:
             return {}
 
     def _recursive_pins(self, keys):
         return len([k for k in keys if keys[k]["Type"] == b"recursive"])
 
+    def _dehumanize(self, storemax):
+        # convert from '10Gb' to 10000000000
+        if type(storemax) != int:
+            storemax = storemax.lower()
+            if storemax.endswith('b'):
+                val, units = storemax[:-2], storemax[-2]
+                if units in SI_zeroes:
+                    val += '0'*SI_zeroes[units]
+                storemax = val
+            try:
+                storemax = int(storemax)
+            except:
+                storemax = None
+        return storemax
+
+    def _storagemax(self, storecfg):
+        if self.__storagemax is None:
+            self.__storagemax = self._dehumanize(storecfg['StorageMax'])
+        return self.__storagemax
 
     def _get_data(self):
         """
         Get data from API
         :return: dict
         """
-        cfg = {# suburl : List of (result-key, original-key, transform-func)
+        cfg = { # suburl : List of (result-key, original-key, transform-func)
                '/api/v0/stats/bw'   :[('in', 'RateIn', int ),
                                       ('out', 'RateOut', int )],
                '/api/v0/swarm/peers':[('peers', 'Strings', len )],
                '/api/v0/stats/repo' :[('size', 'RepoSize', int),
                                       ('objects', 'NumObjects', int)],
                '/api/v0/pin/ls': [('pinned', 'Keys', len),
-                                  ('recursive_pins', 'Keys', self._recursive_pins)
-                                 ]
+                                  ('recursive_pins', 'Keys', self._recursive_pins)],
+               '/api/v0/config/show': [('avail', 'Datastore', self._storagemax)]
         }
         r = {}
         for suburl in cfg:
@@ -96,5 +121,3 @@ class Service(UrlService):
         return r or None
 
 
- 
-