Update agent plugin for new options

Change-Id: Iec34f0ab26763a80c9ed4d6b96156e4ccf83e43b

manifests/checks/instances/network.pp

@@ -13,6 +13,9 @@
 # [*excluded_interface_re*]
 #   regular expression for interfaces to be ignored
 #
+# [*use_bits*]
+#   submits metrics in bits rather than bytes
+#
 # [*dimensions*]
 #   any additional dimensions for the check
 #
@@ -20,6 +23,7 @@ define monasca::checks::instances::network (
   $collect_connection_state = undef,
   $excluded_interfaces      = undef,
   $excluded_interface_re    = undef,
+  $use_bits                 = undef,
   $dimensions               = undef,
 ) {
   $conf_dir = $::monasca::agent::conf_dir

manifests/checks/libvirt.pp

@@ -17,12 +17,15 @@
 # [*identity_uri*]
 #   uri of the keystone instance
 #
+# [*metadata*]
+#   a list of instance metadata to be submitted as dimensions with service data.
+#
+# [*customer_metadata*]
+#   a list of instance metadata to be submitted as dimensions with cusomter data.
+#
 # [*region_name*]
 #   openstack keystone region for this install
 #
-# [*heat_scale_group*]
-#   flag to indicate if scale group should be posted
-#
 # [*cache_dir*]
 #   Cache directory to persist data.
 # [*vm_probation*]
@@ -38,8 +41,9 @@ class monasca::checks::libvirt(
   $admin_user,
   $admin_password,
   $admin_tenant_name,
-  $heat_scale_group  = false,
   $identity_uri,
+  $metadata          = undef,
+  $customer_metadata = undef,
   $region_name       = undef,
   $cache_dir         = '/dev/shm',
   $vm_probation      = '300',

manifests/checks/network.pp

@@ -12,6 +12,7 @@
 #       collect_connection_state (default = False)
 #       excluded_interfaces
 #       excluded_interface_re: A regular expression for excluded interfaces
+#       use_bits
 #       dimensions
 #   e.g.
 #   instances:

templates/checks/libvirt.yaml.erb

@@ -9,9 +9,11 @@ init_config:
 <%- end -%>
   cache_dir: <%= @cache_dir %>
   nova_refresh: <%= @nova_refresh %>
-<%- if @heat_scale_group -%>
-  metadata:
-  - scale_group
+<%- if @metadata -%>
+  metadata: <%= @metadata %>
+<%- end -%>
+<%- if @customer_metadata -%>
+  customer_metadata: <%= @customer_metadata %>
 <%- end -%>
   vm_probation: <%= @vm_probation %>
 

templates/checks/network.erb

@@ -8,6 +8,9 @@
 <%- if @excluded_interface_re -%>
    excluded_interface_re: <%= @excluded_interface_re %>
 <%- end -%>
+<%- if @use_bits -%>
+   use_bits: <%= @use_bits %>
+<%- end -%>
 <%- if @dimensions -%>
    dimensions: <%= @dimensions %>
 <%- end -%>