Merge "Add ovs-plugins, hugepages and uptime to collectd"

deployment/metrics/collectd-container-puppet.yaml

@@ -79,12 +79,14 @@ parameters:
       - cpu
       - df
       - disk
+      - hugepages
       - interface
       - load
       - memory
       - processes
       - tcpconns
       - unixsock
+      - uptime
     type: comma_delimited_list
     description: >
       List of collectd plugins to activate on all overcloud hosts.  See

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -214,6 +214,12 @@ outputs:
                 - neutron
               tripleo_fluentd_sources_neutron_ovs_agent:
                 - {get_param: NeutronOpenVswitchAgentLoggingSource}
+          - collectd:
+              tripleo.collectd.plugins.neutron_ovs_agent:
+                - ovs_events
+                - ovs_stats
+              collectd::plugin::ovs_events::socket: '/var/run/openvswitch/db.sock'
+              collectd::plugin::ovs_stats::socket: '/var/run/openvswitch/db.sock'
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2

environments/metrics/collectd-standalone.yaml

@@ -13,18 +13,49 @@ resource_registry:
 #     - cpu
 #     - df
 #     - disk
+#     - hugepages
 #     - interface
 #     - load
 #     - memory
 #     - processes
 #     - tcpconns
+#     - uptime
 #
 ## Extra plugins can be enabled by the CollectdExtraPlugins parameter:
 ## All the plugins availables are:
 #
 #   CollectdExtraPlugins:
 #     - amqp1
-#     - ovs-stats
+#     - apache
+#     - bind
+#     - ceph
+#     - chrony
+#     - connectivity
+#     - conntrack
+#     - contextswitch
+#     - cpufreq
+#     - cpusleep
+#     - curl
+#     - curl_json
+#     - curl_xml
+#     - dns
+#     - fhcount
+#     - filecount
+#     - irq
+#     - ipmi
+#     - mcelog
+#     - mysql
+#     - netlink
+#     - nfs
+#     - ovs_events
+#     - ovs_stats
+#     - ping
+#     - procevent
+#     - protocols
+#     - sensors
+#     - smart
+#     - users
+#     - virt
 #
 ## To choose write plugin use below parameter:
 #