instances: fix counter unit

Fixes: bug#1165123

Change-Id: Ib51c10fc8d622dc1ff121b3aedf479d62d7872f3
Signed-off-by: Julien Danjou <julien@danjou.info>
(cherry picked from commit c498562b539fab1dc810b5113fede71df0f9de91)
update the ceilometer.conf.sample

- also update the extract_opts.py as it was not working

fixes bug #1173201

Change-Id: I348c9d37900deb520d04b3e3855012da2cdf8236
(cherry picked from commit 182814336a4beb67302b31c93bf582c2050f03f2)
Lock down test dependencies on nova & glance tarballs

Use the grizzly final versions of the nova & glance tarballs
to avoid issues with testing ceilometer stable/grizzly against
the havana master tarballs.

Change-Id: I6829fba1cd426d8998e95e38518b95bfc80e6360
Adds examples of CLI and API queries to the V2 documentation.

This patch includes additional reST-formatted text that will add new/expanded examples of v2 API use to the existing documentation.
Fixes: bug #1160929

Change-Id: I63fa9dd8b050a63f005c4a5b35399355fdeb7605
(cherry picked from commit 6979b16e2c5ce84fb04cbb8ea34a55ea77a8abe7)
Measurements documentation update

Nova measurements:
- add cpu_util
- del disk.io.requests, disk.io.bytes
- add instance unit to instance:*

+fix some errors on type and unit

for all measurements add new column 'Origin' :
notification|pollster|both

tag : DocImpact
Fixes: bug #1164032

Change-Id: I0046032b8835168772fc7fff6c34a9be99ddbd56
(cherry picked from commit 6f7efd1efedbc4baa7c2263d1536a985f0895fc0)
Set hbase table_prefix default to None

...table_prefix default value was empty string which fails the connection to hbase thrift server. it should be set to None instead...

Change-Id: I1339c7dad09d311f0a4e3b16d67057e3471e8c5b
Fixes: bug #1173205
(cherry picked from commit 8bcc3773ac0153f69e56508a17abf465d90492a0)
Ceilometer configuration.rst file not using right param names for logging

configuration.rst file lists all the configuration parameters for ceilometer
configuration. However, for logging, these parameter names should be log_dir
and log_file, but currently it is logdir and logfile.

The table also misses log_config.

There should be a link in configuration.rst file to point a user to the
sample configuration file.

Change-Id: Ic96f303ee7e30faf23c0a6433af5cb5111d35616
fixes: bug #1171905
(cherry picked from commit 09fec9d837e8d2fb5d451c50b2fe3e468e5f8acc)
Merge "update the ceilometer.conf.sample" into stable/grizzly
Merge "Measurements documentation update" into stable/grizzly
Merge "instances: fix counter unit" into stable/grizzly
Merge "Set hbase table_prefix default to None" into stable/grizzly
Merge "Adds examples of CLI and API queries to the V2 documentation." into stable/grizzly
Merge "Ceilometer configuration.rst file not using right param names for logging" into stable/grizzly