Merge branch 'develop'

README.md

@@ -7,6 +7,7 @@ MiCADO is an auto-scaling framework for Docker applications. It supports autosca
 MiCADO manual is hosted at https://micado-scale.readthedocs.io .
 
 Manuals for MiCADO versions are as follows:
+ - [MiCADO 0.7.1](https://micado-scale.readthedocs.io/en/0.7.1)
  - [MiCADO 0.7.0](https://micado-scale.readthedocs.io/en/0.7.0)
  - [MiCADO 0.6.1](https://micado-scale.readthedocs.io/en/0.6.1)
  - [MiCADO 0.6.0](https://micado-scale.readthedocs.io/en/0.6.0)

micado-master.yml

@@ -16,7 +16,7 @@
       assert:
         that:
           - "ansible_os_family == 'Debian'"
-          - "ansible_distribution_version is version('16.04', '==')"
+          - "ansible_distribution_version == '16.04'"
         msg: >
           "The required OS is Ubuntu 16.04"
 
@@ -52,16 +52,15 @@
         consul: consul:1.0.0
         credential_manager: micado/credential-manager:0.2.0
         dashboard: micado/dashboard:0.3.0
-        dockervisualizer: micado/dockerviz:min-refresh
         grafana: grafana/grafana:5.1.0
         node_exporter: prom/node-exporter:v0.15.2
         occopus: micado/occopus:1.6-rc1
         policykeeper: micado/policykeeper:0.1-dev-frame
         prometheus: prom/prometheus:v2.1.0
         redis: redis:4.0
-        toscasubmitter: micado/toscasubmitter:0.1.8
+        toscasubmitter: micado/toscasubmitter:0.1.9
         zorp: micado/zorpgpl:6.0.11
     - docker_package: docker-ce=17.09.1~ce-0~ubuntu
     - github_versions:
-        policykeeper: v0.7.0
-        toscasubmitter: v0.7.0
+        policykeeper: v0.7.1
+        toscasubmitter: v0.7.1

roles/micado-master/files/grafana/data-dashboards-micado.json

@@ -1149,32 +1149,23 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "label_replace(topk($topk,sum(rate(container_network_receive_bytes_total{container_label_io_kubernetes_container_name=~\"$service_name\",container_label_io_kubernetes_pod_uid=~\"$node\"}[$interval])) by (name, container_label_io_kubernetes_pod_name)), \"task_name\", \"$1\", \"container_label_io_kubernetes_pod_name\", \"(.*)\")",
+          "expr": "label_replace(topk($topk, rate(container_network_receive_bytes_total{container_label_io_kompose_service=~\"$service_name\",container_label_io_kubernetes_pod_uid=~\"$node\"}[2m])*100), \"task_name\", \"$1\", \"container_label_io_kubernetes_pod_name\", \"(.*)\")",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{task_name}}",
           "refId": "A",
           "step": 240
-        },
-        {
-          "expr": "- rate(container_network_transmit_bytes_total{name=~\".+\"}[$interval])",
-          "format": "time_series",
-          "hide": true,
-          "intervalFactor": 2,
-          "legendFormat": "{{name}}",
-          "refId": "B",
-          "step": 10
         }
       ],
       "thresholds": [],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Received Network Traffic per Container (stacked)",
+      "title": "Received Network Traffic per Container (Stacked)",
       "tooltip": {
         "msResolution": true,
         "shared": true,
         "sort": 2,
-        "value_type": "cumulative"
+        "value_type": "individual"
       },
       "transparent": false,
       "type": "graph",