Make transformer entry point names consistent with config file

Change-Id: Ic8956170d9f6c03c16e69ecb11b69ff24ba99aaf

etc/meter_mappings.yml

@@ -1,128 +0,0 @@
--
-  # meter name as seen in ceilometer
-  meter: instance
-  # type of resource it maps to (seen on sales order)
-  type: Virtual Machine
-  # which transformer to use
-  transformer: InstanceUptime
-  # what unit type is coming in via the meter
-  unit: second
-  metadata:
-    name:
-      sources:
-        # which keys to search for in the ceilometer entry metadata
-        # this can be more than one as metadata is inconsistent between
-        # source types
-        - display_name
-    availability zone:
-      sources:
-        - OS-EXT-AZ:availability_zone
-    host:
-      sources:
-        - instance_host
--
-  meter: ip.floating
-  service: n1.ipv4
-  type: Floating IP
-  transformer: GaugeMax
-  unit: hour
-  metadata:
-    ip address:
-      sources:
-        - floating_ip_address
--
-  meter: volume.size
-  service: b1.standard
-  type: Volume
-  transformer: GaugeMax
-  unit: gigabyte
-  metadata:
-    name:
-      sources:
-        - display_name
-    availability zone:
-      sources:
-        - availability_zone
--
-  meter: instance
-  service: b1.standard
-  type: Volume
-  transformer: FromImage
-  unit: gigabyte
-  # if true allows id pattern, and metadata patterns
-  transform_info: True
-  # allows us to put the id into a pattern,
-  # only if transform_info is true,
-  # such as to append something to it
-  res_id_template: "%s-root_disk"
-  metadata:
-    name:
-      sources:
-        - display_name
-      template: "%s - root disk"
-    availability zone:
-      sources:
-        - availability_zone
--
-  meter: image.size
-  service: b1.standard
-  type: Image
-  transformer: GaugeMax
-  unit: byte
-  metadata:
-    name:
-      sources:
-        - name
-        - properties.image_name
--
-  meter: bandwidth
-  type: Network Traffic
-  transformer: GaugeSum
-  unit: byte
-  metadata:
-    meter_label_id:
-      sources:
-        - label_id
--
-  meter: network.services.vpn
-  type: VPN
-  transformer: GaugeNetworkService
-  unit: hour
-  metadata:
-    name:
-      sources:
-        - name
-    subnet:
-      sources:
-        - subnet_id
--
-  meter: network
-  type: Network
-  transformer: GaugeMax
-  unit: hour
-  metadata:
-    name:
-      sources:
-        - name
--
-  meter: router
-  type: Router
-  transformer: GaugeMax
-  unit: hour
-  metadata:
-    name:
-      sources:
-        - name
--
-  meter: storage.containers.objects.size
-  service: o1.standard
-  type: Object Storage Container
-  transformer: GaugeMax
-  unit: byte
-  # NOTE(flwang): Nothing in resource_metadata from ceilometer actually.
-  # But to avoid any unnecessary issue and keeping consistency. Just keep
-  # 'name' as default key.
-  metadata:
-    name:
-      sources:
-        - name

etc/meter_mappings.yml.sample

@@ -0,0 +1,242 @@
+-
+  # meter name as seen in ceilometer
+  meter: instance
+  # type of resource it maps to (seen on sales order)
+  type: Virtual Machine
+  # which transformer to use
+  transformer: uptime
+  # what unit type is coming in via the meter
+  unit: second
+  metadata:
+    name:
+      sources:
+        # which keys to search for in the ceilometer entry metadata
+        # this can be more than one as metadata is inconsistent between
+        # source types
+        - display_name
+    availability zone:
+      sources:
+        - OS-EXT-AZ:availability_zone
+    host:
+      sources:
+        - instance_host
+-
+  meter: ip.floating
+  service: n1.ipv4
+  type: Floating IP
+  transformer: max
+  unit: hour
+  metadata:
+    ip address:
+      sources:
+        - floating_ip_address
+-
+  meter: volume.size
+  service: b1.standard
+  type: Volume
+  transformer: max
+  unit: gigabyte
+  metadata:
+    name:
+      sources:
+        - display_name
+    availability zone:
+      sources:
+        - availability_zone
+-
+  meter: instance
+  service: b1.standard
+  type: Volume
+  transformer: fromimage
+  unit: gigabyte
+  # if true allows id pattern, and metadata patterns
+  transform_info: True
+  # allows us to put the id into a pattern,
+  # only if transform_info is true,
+  # such as to append something to it
+  res_id_template: "%s-root_disk"
+  metadata:
+    name:
+      sources:
+        - display_name
+      template: "%s - root disk"
+    availability zone:
+      sources:
+        - availability_zone
+-
+  meter: image.size
+  service: b1.standard
+  type: Image
+  transformer: max
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+        - properties.image_name
+-
+  meter: traffic.outbound.international
+  service: n1.international-out
+  type: Outbound International Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: traffic.inbound.international
+  service: n1.international-in
+  type: Inbound International Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: traffic.outbound.national
+  service: n1.national-out
+  type: Outbound National Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: traffic.inbound.national
+  service: n1.national-in
+  type: Inbound National Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: network.services.vpn
+  service: n1.vpn
+  type: VPN
+  transformer: networkservice
+  unit: hour
+  metadata:
+    name:
+      sources:
+        - name
+    subnet:
+      sources:
+        - subnet_id
+-
+  meter: network
+  service: n1.network
+  type: Network
+  transformer: max
+  unit: hour
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: router
+  service: n1.router
+  type: Router
+  transformer: max
+  unit: hour
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.containers.objects.size
+  service: o1.standard
+  type: Object Storage Container
+  transformer: max
+  unit: byte
+  # NOTE(flwang): Nothing in resource_metadata from ceilometer actually.
+  # But to avoid any unnecessary issue and keeping consistency. Just keep
+  # 'name' as default key.
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.download.size.national
+  service: o1.national-out
+  type: Swift Outbound National Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.upload.size.national
+  service: o1.national-in
+  type: Swift Inbound National Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.download.size.international
+  service: o1.international-out
+  type: Swift Outbound International Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.upload.size.international
+  service: o1.international-in
+  type: Swift Inbound International Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.download.size.inter-region
+  service: o1.inter-region-out
+  type: Swift Outbound Inter-region Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.upload.size.inter-region
+  service: o1.inter-region-in
+  type: Swift Inbound Inter-region Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.download.size.internal
+  service: o1.internal-out
+  type: Swift Outbound Internal Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name
+-
+  meter: storage.objects.upload.size.internal
+  service: o1.internal-in
+  type: Swift Inbound Internal Traffic
+  transformer: sum
+  unit: byte
+  metadata:
+    name:
+      sources:
+        - name