Bump to v3.4.2

Author: deadtrickster

README.md

@@ -4,7 +4,7 @@
 
 Copyright (c) 2016,2017 Ilya Khaprov <<[email protected]>>.
 
-__Version:__ 3.4.1
+__Version:__ 3.4.2
 
 [![Hex.pm](https://img.shields.io/hexpm/v/prometheus.svg?maxAge=2592000?style=plastic)](https://hex.pm/packages/prometheus)
 [![Hex.pm](https://img.shields.io/hexpm/dt/prometheus.svg?maxAge=2592000)](https://hex.pm/packages/prometheus)

doc/README.md

@@ -4,7 +4,7 @@
 
 Copyright (c) 2016,2017 Ilya Khaprov <<[email protected]>>.
 
-__Version:__ 3.4.1
+__Version:__ 3.4.2
 
 [![Hex.pm](https://img.shields.io/hexpm/v/prometheus.svg?maxAge=2592000?style=plastic)](https://hex.pm/packages/prometheus)
 [![Hex.pm](https://img.shields.io/hexpm/dt/prometheus.svg?maxAge=2592000)](https://hex.pm/packages/prometheus)

doc/overview.md

@@ -1,6 +1,6 @@
 @copyright 2016,2017 Ilya Khaprov <<[email protected]>>.
 @title Prometheus.io client for Erlang
-@version 3.4.1
+@version 3.4.2
 
 @doc
 [![Hex.pm](https://img.shields.io/hexpm/v/prometheus.svg?maxAge=2592000?style=plastic)](https://hex.pm/packages/prometheus)

doc/prometheus_collector.md

@@ -8,7 +8,7 @@
 
 A collector for a set of metrics.
 
-__This module defines the `prometheus_collector` behaviour.__<br /> Required callback functions: `collect_mf/2`, `collect_metrics/2`, `deregister_cleanup/1`.
+__This module defines the `prometheus_collector` behaviour.__<br /> Required callback functions: `collect_mf/2`, `deregister_cleanup/1`.
 
 <a name="description"></a>
 

doc/prometheus_model_helpers.md

@@ -20,6 +20,46 @@ Probably will be used with [`prometheus_collector`](prometheus_collector.md).
 
 
 
+### <a name="type-buckets">buckets()</a> ###
+
+
+<pre><code>
+buckets() = [{<a href="prometheus_buckets.md#type-bucket_bound">prometheus_buckets:bucket_bound()</a>, non_neg_integer()}, ...]
+</code></pre>
+
+
+
+
+### <a name="type-counter">counter()</a> ###
+
+
+<pre><code>
+counter() = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {<a href="#type-labels">labels()</a>, <a href="#type-value">value()</a>}
+</code></pre>
+
+
+
+
+### <a name="type-gauge">gauge()</a> ###
+
+
+<pre><code>
+gauge() = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {<a href="#type-labels">labels()</a>, <a href="#type-value">value()</a>}
+</code></pre>
+
+
+
+
+### <a name="type-histogram">histogram()</a> ###
+
+
+<pre><code>
+histogram() = {<a href="#type-buckets">buckets()</a>, non_neg_integer(), <a href="#type-value">value()</a>} | {<a href="#type-labels">labels()</a>, <a href="#type-buckets">buckets()</a>, non_neg_integer(), <a href="#type-value">value()</a>}
+</code></pre>
+
+
+
+
 ### <a name="type-label">label()</a> ###
 
 
@@ -50,6 +90,36 @@ label_value() = term()
 
 
 
+### <a name="type-labels">labels()</a> ###
+
+
+<pre><code>
+labels() = [<a href="#type-labels">labels()</a>]
+</code></pre>
+
+
+
+
+### <a name="type-metrics">metrics()</a> ###
+
+
+<pre><code>
+metrics() = [<a href="#type-tmetric">tmetric()</a>]
+</code></pre>
+
+
+
+
+### <a name="type-pbool">pbool()</a> ###
+
+
+<pre><code>
+pbool() = <a href="#type-prometheus_boolean">prometheus_boolean()</a> | {<a href="#type-prometheus_boolean">prometheus_boolean()</a>} | {<a href="#type-labels">labels()</a>, <a href="#type-prometheus_boolean">prometheus_boolean()</a>}
+</code></pre>
+
+
+
+
 ### <a name="type-prometheus_boolean">prometheus_boolean()</a> ###
 
 
@@ -60,6 +130,36 @@ prometheus_boolean() = boolean() | number() | list() | undefined
 
 
 
+### <a name="type-summary">summary()</a> ###
+
+
+<pre><code>
+summary() = {non_neg_integer(), <a href="#type-value">value()</a>} | {<a href="#type-labels">labels()</a>, non_neg_integer(), <a href="#type-value">value()</a>}
+</code></pre>
+
+
+
+
+### <a name="type-tmetric">tmetric()</a> ###
+
+
+<pre><code>
+tmetric() = <a href="#type-gauge">gauge()</a> | <a href="#type-counter">counter()</a> | <a href="#type-untyped">untyped()</a> | <a href="#type-summary">summary()</a> | <a href="#type-histogram">histogram()</a> | <a href="#type-pbool">pbool()</a>
+</code></pre>
+
+
+
+
+### <a name="type-untyped">untyped()</a> ###
+
+
+<pre><code>
+untyped() = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {<a href="#type-labels">labels()</a>, <a href="#type-value">value()</a>}
+</code></pre>
+
+
+
+
 ### <a name="type-value">value()</a> ###
 
 
@@ -80,7 +180,8 @@ Creates boolean metric with <code>Labels</code> and <code>Value</code>.</td></tr
 Equivalent to
 <a href="#counter_metric-2"><tt>counter_metric(Labels, Value)</tt></a>.</td></tr><tr><td valign="top"><a href="#counter_metric-2">counter_metric/2</a></td><td>
 Creates counter metric with <code>Labels</code> and <code>Value</code>.</td></tr><tr><td valign="top"><a href="#counter_metrics-1">counter_metrics/1</a></td><td>Equivalent to
-<a href="#counter_metric-1"><code>lists:map(fun counter_metric/1, Specs)</code></a>.</td></tr><tr><td valign="top"><a href="#create_mf-5">create_mf/5</a></td><td>
+<a href="#counter_metric-1"><code>lists:map(fun counter_metric/1, Specs)</code></a>.</td></tr><tr><td valign="top"><a href="#create_mf-4">create_mf/4</a></td><td>
+Create Metric Family of <code>Type</code>, <code>Name</code> and <code>Help</code>.</td></tr><tr><td valign="top"><a href="#create_mf-5">create_mf/5</a></td><td>
 Create Metric Family of <code>Type</code>, <code>Name</code> and <code>Help</code>.</td></tr><tr><td valign="top"><a href="#gauge_metric-1">gauge_metric/1</a></td><td>
 Equivalent to
 <a href="#gauge_metric-2"><tt>gauge_metric(Labels, Value)</tt></a>.</td></tr><tr><td valign="top"><a href="#gauge_metric-2">gauge_metric/2</a></td><td>
@@ -112,10 +213,10 @@ Creates untyped metric with <code>Labels</code> and <code>Value</code>.</td></tr
 ### boolean_metric/1 ###
 
 <pre><code>
-boolean_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
+boolean_metric(Boolean) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = boolean() | {boolean()} | {[<a href="#type-label">label()</a>], <a href="#type-prometheus_boolean">prometheus_boolean()</a>}</code></li></ul>
+<ul class="definitions"><li><code>Boolean = <a href="#type-pbool">pbool()</a></code></li></ul>
 
 Equivalent to
 [`boolean_metric(Labels, Value)`](#boolean_metric-2).
@@ -128,7 +229,7 @@ Equivalent to
 boolean_metric(Labels, Value) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Value = <a href="#type-prometheus_boolean">prometheus_boolean()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Value = <a href="#type-prometheus_boolean">prometheus_boolean()</a></code></li></ul>
 
 Creates boolean metric with `Labels` and `Value`.
 
@@ -149,7 +250,7 @@ Equivalent to
 counter_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {[<a href="#type-label">label()</a>], <a href="#type-value">value()</a>}</code></li></ul>
+<ul class="definitions"><li><code>Spec = <a href="#type-counter">counter()</a></code></li></ul>
 
 Equivalent to
 [`counter_metric(Labels, Value)`](#counter_metric-2).
@@ -162,7 +263,7 @@ Equivalent to
 counter_metric(Labels, Value) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
 
 Creates counter metric with `Labels` and `Value`.
 
@@ -175,6 +276,20 @@ Creates counter metric with `Labels` and `Value`.
 Equivalent to
 [`lists:map(fun counter_metric/1, Specs)`](#counter_metric-1).
 
+<a name="create_mf-4"></a>
+
+### create_mf/4 ###
+
+<pre><code>
+create_mf(Name, Help, Type, Metrics) -&gt; MetricFamily
+</code></pre>
+
+<ul class="definitions"><li><code>Name = <a href="prometheus_metric.md#type-name">prometheus_metric:name()</a></code></li><li><code>Help = <a href="prometheus_metric.md#type-help">prometheus_metric:help()</a></code></li><li><code>Type = atom()</code></li><li><code>Metrics = [<a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>] | <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a> | <a href="#type-metrics">metrics()</a></code></li><li><code>MetricFamily = <a href="prometheus_model.md#type-MetricFamily">prometheus_model:'MetricFamily'()</a></code></li></ul>
+
+Create Metric Family of `Type`, `Name` and `Help`.
+`Collector:collect_metrics/2` callback will be called and expected to
+return individual metrics list.
+
 <a name="create_mf-5"></a>
 
 ### create_mf/5 ###
@@ -194,10 +309,10 @@ return individual metrics list.
 ### gauge_metric/1 ###
 
 <pre><code>
-gauge_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
+gauge_metric(Gauge) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {[<a href="#type-label">label()</a>], <a href="#type-value">value()</a>}</code></li></ul>
+<ul class="definitions"><li><code>Gauge = <a href="#type-gauge">gauge()</a></code></li></ul>
 
 Equivalent to
 [`gauge_metric(Labels, Value)`](#gauge_metric-2).
@@ -210,7 +325,7 @@ Equivalent to
 gauge_metric(Labels, Value) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
 
 Creates gauge metric with `Labels` and `Value`.
 
@@ -228,10 +343,10 @@ Equivalent to
 ### histogram_metric/1 ###
 
 <pre><code>
-histogram_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
+histogram_metric(Histogram) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = {Labels, Buckets, Count, Sum} | {Buckets, Count, Sum}</code></li><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Buckets = [{Bound, Count}]</code></li><li><code>Bound = <a href="prometheus_buckets.md#type-bucket_bound">prometheus_buckets:bucket_bound()</a></code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Histogram = <a href="#type-histogram">histogram()</a></code></li></ul>
 
 Equivalent to
 [
@@ -253,7 +368,7 @@ Equivalent to [`histogram_metric([], Buckets, Count, Sum)`](#histogram_metric-4)
 histogram_metric(Labels, Buckets, Count, Sum) -&gt; Metric
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Buckets = [{Bound, Count}]</code></li><li><code>Bound = <a href="prometheus_buckets.md#type-bucket_bound">prometheus_buckets:bucket_bound()</a></code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li><li><code>Metric = <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Buckets = [{Bound, Count}]</code></li><li><code>Bound = <a href="prometheus_buckets.md#type-bucket_bound">prometheus_buckets:bucket_bound()</a></code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li><li><code>Metric = <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a></code></li></ul>
 
 Creates histogram metric with `Labels`, `Buckets`, `Count` and `Sum`.
 
@@ -291,10 +406,10 @@ Equivalent to
 ### summary_metric/1 ###
 
 <pre><code>
-summary_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
+summary_metric(Summary) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = {Labels, Count, Sum} | {Count, Sum}</code></li><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Summary = <a href="#type-summary">summary()</a></code></li></ul>
 
 Equivalent to
 [`summary_metric(Labels, Count, Sum)`](#summary_metric-3).
@@ -315,7 +430,7 @@ Equivalent to [`summary_metric([], Count, Sum)`](#summary_metric-3).
 summary_metric(Labels, Count, Sum) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Count = non_neg_integer()</code></li><li><code>Sum = <a href="#type-value">value()</a></code></li></ul>
 
 Creates summary metric with `Labels`, `Count` and `Sum`.
 
@@ -333,10 +448,10 @@ Equivalent to
 ### untyped_metric/1 ###
 
 <pre><code>
-untyped_metric(Spec) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
+untyped_metric(Untyped) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Spec = <a href="#type-value">value()</a> | {<a href="#type-value">value()</a>} | {[<a href="#type-label">label()</a>], <a href="#type-value">value()</a>}</code></li></ul>
+<ul class="definitions"><li><code>Untyped = <a href="#type-untyped">untyped()</a></code></li></ul>
 
 Equivalent to
 [`untyped_metric(Labels, Value)`](#untyped_metric-2).
@@ -349,7 +464,7 @@ Equivalent to
 untyped_metric(Labels, Value) -&gt; <a href="prometheus_model.md#type-Metric">prometheus_model:'Metric'()</a>
 </code></pre>
 
-<ul class="definitions"><li><code>Labels = [<a href="#type-label">label()</a>]</code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
+<ul class="definitions"><li><code>Labels = <a href="#type-labels">labels()</a></code></li><li><code>Value = <a href="#type-value">value()</a></code></li></ul>
 
 Creates untyped metric with `Labels` and `Value`.
 

doc/prometheus_vm_memory_collector.md

@@ -29,11 +29,11 @@ Type: gauge.<br />
 The total amount of memory currently allocated.
 This is the same as the sum of the memory size for processes and system.
 
-* `erlang_vm_dets_tables`<br />
+* `erlang_vm_memory_dets_tables`<br />
 Type: gauge.<br />
 Erlang VM DETS Tables count.
 
-* `erlang_vm_ets_tables`<br />
+* `erlang_vm_memory_ets_tables`<br />
 Type: gauge.<br />
 Erlang VM ETS Tables count.
 

doc/prometheus_vm_statistics_collector.md

@@ -30,13 +30,13 @@ The total number of bytes received through ports.
 Type: counter.<br />
 The total number of context switches since the system started.
 
-* `erlang_vm_statistics_dirty_cpu_run_queue_length_total`<br />
+* `erlang_vm_statistics_dirty_cpu_run_queue_length`<br />
 Type: gauge.<br />
-The total length of the dirty CPU run-queue.
+Length of the dirty CPU run-queue.
 
-* `erlang_vm_statistics_dirty_io_run_queue_length_total`<br />
+* `erlang_vm_statistics_dirty_io_run_queue_length`<br />
 Type: gauge.<br />
-The total length of the dirty IO run-queue.
+Length of the dirty IO run-queue.
 
 * `erlang_vm_statistics_garbage_collection_number_of_gcs`<br />
 Type: counter.<br />

mix.exs

@@ -3,7 +3,7 @@ defmodule Prometheus.Mixfile do
 
   def project do
     [app: :prometheus,
-     version: "3.4.1",
+     version: "3.4.2",
      description: description(),
      package: package()]
   end

src/prometheus.app.src

@@ -1,6 +1,6 @@
 {application, prometheus,
  [{description, "Prometheus.io client in Erlang"},
-  {vsn, "3.4.1"},
+  {vsn, "3.4.2"},
   {registered, []},
   {mod, { prometheus, []}},
   {applications,