Merge "Limit the default numbers of metrics polled"

ceilometer/tests/unit/agent/agentbase.py

@@ -250,7 +250,7 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
         self.CONF.set_override("backend_url", "zake://", "coordination")
         self.CONF.set_override(
             'cfg_file',
-            self.path_get('etc/ceilometer/polling.yaml'), group='polling'
+            self.path_get('etc/ceilometer/polling_all.yaml'), group='polling'
         )
         self.mgr = self.create_manager()
         self.mgr.extensions = self.create_extension_list()

devstack/plugin.sh

@@ -351,9 +351,10 @@ function configure_ceilometer {
     # with rootwrap installation done elsewhere and also clobber
     # ceilometer.conf settings that have already been made.
     # Anyway, explicit is better than implicit.
-    for conffile in policy.json api_paste.ini polling.yaml; do
+    for conffile in policy.json api_paste.ini; do
         cp $CEILOMETER_DIR/etc/ceilometer/$conffile $CEILOMETER_CONF_DIR
     done
+    cp $CEILOMETER_DIR/etc/ceilometer/polling_all.yaml $CEILOMETER_CONF_DIR/polling.yaml
 
     cp $CEILOMETER_DIR/ceilometer/pipeline/data/*.yaml $CEILOMETER_CONF_DIR
 

etc/ceilometer/polling.yaml

@@ -1,6 +1,26 @@
 ---
 sources:
-    - name: all_pollsters
+    - name: some_pollsters
       interval: 300
       meters:
-          - "*"
+        - cpu
+        - memory.usage
+        - network.incoming.bytes
+        - network.incoming.packets
+        - network.outgoing.bytes
+        - network.outgoing.packets
+        - disk.read.bytes
+        - disk.read.requests
+        - disk.write.bytes
+        - disk.write.requests
+        - hardware.cpu.util
+        - hardware.memory.used
+        - hardware.memory.total
+        - hardware.memory.buffer
+        - hardware.memory.cached
+        - hardware.memory.swap.avail
+        - hardware.memory.swap.total
+        - hardware.system_stats.io.outgoing.blocks
+        - hardware.system_stats.io.incoming.blocks
+        - hardware.network.ip.incoming.datagrams
+        - hardware.network.ip.outgoing.datagrams

etc/ceilometer/polling_all.yaml

@@ -0,0 +1,6 @@
+---
+sources:
+    - name: all_pollsters
+      interval: 300
+      meters:
+        - "*"