Fix documentation following the 0.3.3-SNAPSHOT changes

Author: burmanm

README.md

@@ -21,7 +21,7 @@ See metrics_test.py for more detailed examples. The tests target a running docke
 
 ### General
 
-When a method wants a metric_type one can use the shortcuts of MetricType.Numeric or MetricType.Availability. For availability values, one can use Availability.Up and Availability.Down to simplify usage.
+When a method wants a metric_type one can use the shortcuts of MetricType.Gauge or MetricType.Availability. For availability values, one can use Availability.Up and Availability.Down to simplify usage.
 
 ```python
 >>> from hawkular.metrics import *
@@ -36,7 +36,8 @@ Example:
 
 ```python
 >>> client.create_numeric_definition('example.metric.1', dataRetention=90, units='bytes', hostname='localhost')
->>> client.query_definitions(metrics.MetricType.Numeric)
+True
+>>> client.query_definitions(metrics.MetricType.Gauge)
 [{u'tags': {u'units': u'bytes', u'hostname': u'localhost'}, u'id': u'example.metric.1', u'dataRetention': 90, u'tenantId': u'doc'}]
 ```
 
@@ -48,13 +49,13 @@ Example:
 
 ```python
 >>> client.create_numeric_definition('example.metric.1', dataRetention=90, units='bytes', hostname='localhost')
->>> client.query_metric_tags(MetricType.Numeric, 'example.metric.1')
+>>> client.query_metric_tags(MetricType.Gauge, 'example.metric.1')
 {u'units': u'bytes', u'hostname': u'localhost'}
->>> client.delete_metric_tags(MetricType.Numeric, 'example.metric.1', units='bytes')
->>> client.query_metric_tags(MetricType.Numeric, 'example.metric.1')
+>>> client.delete_metric_tags(MetricType.Gauge, 'example.metric.1', units='bytes')
+>>> client.query_metric_tags(MetricType.Gauge, 'example.metric.1')
 {u'hostname': u'localhost'}
->>> client.update_metric_tags(MetricType.Numeric, 'example.metric.1', hostname='machine1', env='test')
->>> client.query_metric_tags(MetricType.Numeric, 'example.metric.1')
+>>> client.update_metric_tags(MetricType.Gauge, 'example.metric.1', hostname='machine1', env='test')
+>>> client.query_metric_tags(MetricType.Gauge, 'example.metric.1')
 {u'hostname': u'machine1', u'env': u'test'}
 ```
 
@@ -66,23 +67,23 @@ Example pushing a single value:
 
 ```python
 datapoint = create_datapoint(float(4.35), time_millis())
-metric = create_metric('example.metric.1', datapoint)
-client.put(MetricType.Numeric, metric)
+metric = create_metric(MetricType.Gauge, 'example.metric.1', datapoint)
+client.put(metric)
 ```
 
 And a shortcut method for the above:
 
 ```python
-client.push(MetricType.Numeric, 'example.metric.1', float(4.35))
+client.push(MetricType.Gauge, 'example.metric.1', float(4.35))
 ```
 
 Example pushing multiple values for the same metric (with given timestamp and without):
 
 ```python
 >>> v1 = create_datapoint(float(2.345)) # Timestamp is autogenerated
 >>> v2 = create_datapoint(float(3.45), 1429711362289) # Timestamp is given
->>> m = create_metric('example.metric.2', [v1, v2])
->>> client.put(MetricType.Numeric, m)
+>>> m = create_metric(MetricType.Gauge, 'example.metric.2', [v1, v2])
+>>> client.put(m)
 >>> client.query_single_numeric('example.metric.2')
 [{u'timestamp': 1429711362289, u'value': 3.45}, {u'timestamp': 1429711311895, u'value': 2.345}]
 ```
@@ -94,11 +95,11 @@ To push multiple metrics with multiple values per metric, see metrics_test.py an
 Querying metrics is limited to just metric_id querying now with given search_options. Search for tagged data is coming up later. The supported parameters are ``start``, ``end``, ``buckets``, ``bucketDuration`` and ``distinct``. The returned data structure will change depending on the given parameters. 
 
 ```python
->>> c.query_metric(MetricType.Numeric, 'test.query.numeric.1')
+>>> c.query_metric(MetricType.Gauge, 'test.query.numeric.1')
 [{u'timestamp': 1429816731689, u'value': 1.45}, {u'timestamp': 1429816729689, u'value': 2.0}]
->>> c.query_metric(MetricType.Numeric, 'test.query.numeric.1', start=1429816731689)
+>>> c.query_metric(MetricType.Gauge, 'test.query.numeric.1', start=1429816731689)
 [{u'timestamp': 1429816731689, u'value': 1.45}]
->>> c.query_metric(MetricType.Numeric, 'test.query.numeric.1', buckets=1)
+>>> c.query_metric(MetricType.Gauge, 'test.query.numeric.1', buckets=1)
 [{u'end': 1429816997651, u'min': 1.45, u'max': 2.0, u'median': 1.725, u'value': u'NaN', u'start': 1429788197651, u'avg': 1.725, u'empty': False, u'percentile95th': 2.0}]
 ```