merge

--HG--
branch : feature/docker

ansible/roles/escalator/handlers/main.yml

+---
+- name: reload telegraf
+  service:
+    name: telegraf
+    state: restarted

ansible/roles/escalator/meta/main.yml

+---

ansible/roles/escalator/tasks/main.yml

+- name: "Include OS-specific tasks"
+  include: "os/{{ ansible_distribution }}/main.yml"
+
+- name: Install escalator monitoring
+  template:
+    src: "etc/telegraf/telegraf.d/noc-escalator.conf.j2"
+    dest: "{{etc_prefix}}/telegraf/telegraf.d/noc-escalator.conf"
+  notify: reload telegraf
+  tags:
+    - config
\ No newline at end of file

ansible/roles/escalator/tasks/os/FreeBSD/main.yml

+---

ansible/roles/escalator/templates/etc/telegraf/telegraf.d/noc-escalator.conf.j2

+[[inputs.procstat]]
+pattern = "noc-escalator"
+  fielddrop=["involuntary_context_switches", "voluntary_context_switches", "pid", "cpu_time_guest","cpu_time_guest_nice","cpu_time_idle","cpu_time_iowait","cpu_time_irq","cpu_time_nice","cpu_time_soft_irq","cpu_time_steal","cpu_time_stolen"]
+
+[[inputs.httpjson]]
+  name = "noc-escalator"
+  servers = [
+{% for service in noc_config.services -%}
+    {% if "escalator" in service -%}
+        {% for host in noc_config.services[service] -%}
+            {% if ansible_host in host -%}
+"http://{{host}}/mon/",
+            {%- endif %}
+        {%- endfor %}
+    {%- endif %}
+{%- endfor %}
+  ]
+  method = "GET"
+  tag_keys = ["service", "instance"]
+  tagexclude = ["server"]
\ No newline at end of file

ansible/roles/tgsender/handlers/main.yml

+---
+- name: reload telegraf
+  service:
+    name: telegraf
+    state: restarted

ansible/roles/tgsender/meta/main.yml

+---
\ No newline at end of file

ansible/roles/tgsender/tasks/main.yml

+---
+- include: "os/{{ ansible_distribution }}/main.yml"
+
+- name: Install tgsender monitoring
+  template:
+    src: "etc/telegraf/telegraf.d/noc-tgsender.conf.j2"
+    dest: "{{etc_prefix}}/telegraf/telegraf.d/noc-tgsender.conf"
+  notify: reload telegraf
+  tags:
+    - config

ansible/roles/tgsender/tasks/os/CentOS/main.yml

+---

ansible/roles/tgsender/tasks/os/Debian/main.yml

+---

ansible/roles/tgsender/tasks/os/FreeBSD/main.yml

+---

ansible/roles/tgsender/tasks/os/RedHat/main.yml

+---

ansible/roles/tgsender/tasks/os/Ubuntu/main.yml

+---

ansible/roles/tgsender/templates/etc/telegraf/telegraf.d/noc-tgsender.conf.j2

+[[inputs.procstat]]
+pattern = "noc-tgsender"
+  fielddrop=["involuntary_context_switches", "voluntary_context_switches", "pid", "cpu_time_guest","cpu_time_guest_nice","cpu_time_idle","cpu_time_iowait","cpu_time_irq","cpu_time_nice","cpu_time_soft_irq","cpu_time_steal","cpu_time_stolen"]
+
+[[inputs.httpjson]]
+  name = "noc-tgsender"
+  servers = [
+{% for service in noc_config.services -%}
+    {% if "tgsender" in service -%}
+        {% for host in noc_config.services[service] -%}
+            {% if ansible_host in host -%}
+"http://{{host}}/mon/",
+            {%- endif %}
+        {%- endfor %}
+    {%- endif %}
+{%- endfor %}
+  ]
+  method = "GET"
+  tag_keys = ["service", "instance"]
+  tagexclude = ["server"]
\ No newline at end of file

bi/models/dashboard.py

@@ -11,7 +11,7 @@ import datetime
 ## Third-party modules
 from mongoengine.document import Document
 from mongoengine.fields import (StringField, DateTimeField, ListField,
-                                IntField)
+                                IntField, BinaryField)
 
 
 class Dashboard(Document):
@@ -33,7 +33,7 @@ class Dashboard(Document):
     # Config format version
     format = IntField(default=1)
     # gzip'ed data
-    config = StringField()
+    config = BinaryField()
     #
     created = DateTimeField(default=datetime.datetime.now)
     changed = DateTimeField(default=datetime.datetime.now)

collections/inv.capabilities/Huawei/NDP.json

+{
+    "name": "Huawei | NDP",
+    "$collection": "inv.capabilities",
+    "uuid": "4853bafd-51d5-4bde-82e7-99337e88a82b",
+    "description": "Huawei NDP is enabled",
+    "type": "bool",
+    "card_template": ""
+}
\ No newline at end of file