Merge branch 'master' into teams-api

# Conflicts:
#	sdcclient/_client.py

Author: davideschiera

examples/get_data_simple.py

@@ -29,8 +29,7 @@
 # You just need to specify the ID for keys, and ID with aggregation for values.
 #
 metrics =   [
-                # { "id": "agent.tag.team" },
-                # { "id": "kubernetes.pod.label.name" },
+                # { "id": "container.id" },
                 # { "id": "agent.tag.env", "aggregations": { "time": "concat", "group": "concat" } },
                 { "id": "cpu.used.percent", "aggregations": { "time": "timeAvg", "group": "avg" } }
             ]
@@ -55,10 +54,15 @@
 #
 sampling =  60
 
+#
+# Paging (from and to included; by default you get from=0 to=9)
+#
+paging = { "from": 0, "to": 9 }
+
 #
 # Load data
 #
-res = sdclient.get_data(metrics, start, end, sampling, filter = filter)
+res = sdclient.get_data(metrics, start, end, sampling, filter = filter, paging = paging)
 
 #
 # Show the result

sdcclient/_client.py

@@ -663,6 +663,7 @@ def add_dashboard_panel(self, dashboard, name, panel_type, metrics, scope=None,
         v_count = 0
         for i, metric in enumerate(metrics):
             property_name = 'v' if 'aggregations' in metric else 'k'
+
             if property_name == 'k':
                 i = k_count
                 k_count += 1
@@ -1596,8 +1597,8 @@ def get_agents_config(self):
 
     def set_agents_config(self, config):
         res = requests.put(self.url + '/api/agents/config', headers=self.hdrs, data=json.dumps(config))
-        if not self.__checkResponse(res):
-            return [False, self.lasterr]
+        if not self.__checkResponse(res):
+            return [False, self.lasterr]
         return [True, res.json()]
 
     def clear_agents_config(self):