Commit Graph

30 Commits

Author SHA1 Message Date
David Ashpole
ece1334172 update testify dependency 2017-11-17 16:15:28 -08:00
Allen Sun
a0c1a1c33f Update prometheus_collector.go
fix incorrect comparison err message
2017-08-24 08:54:27 +08:00
Tim St. Clair
afe67fec68
Cleanup comment style: // should be proceded by a space 2016-10-07 17:06:02 -07:00
Jimmi Dyson
923dbc58c1
Convert Prometheus labels into single consistent string label for cadvisor 2016-09-23 13:06:52 +01:00
Jimmi Dyson
041c5af905
Switch to Prometheus decoder 2016-09-22 22:22:07 +01:00
mwringe
b8b541d86a Update collectors to use a customized httpClient. 2016-07-21 16:00:21 -04:00
Matt Wringe
6ef612f21e Update collectors to be able to directly access containers by their ip address. 2016-07-14 10:36:53 -04:00
Thomas Desrosiers
960df35f4e Fixes a panic when a prometheus endpoint ends prematurely or with an empty line 2016-06-03 14:10:24 -07:00
Marcin Wielgus
fb8efe0cf6 Add a flag to control the number of custom metrics scraped by collectors 2016-02-11 01:33:58 +01:00
Solly Ross
d11dd29ecd Make Prometheus Collector Filter Custom Metrics
Previously, the Prometheus collector ignored the
`MetricsConfig` field of the custom metrics specification,
simply storing all exposed metrics.  Now, if the `MetricsConfig`
field contains any metric names, only those metrics will be stored
and exposed.

Fixes #1005
2015-12-09 19:44:23 -05:00
Lei Xue
dbbe38dfed re-order the import package 2015-11-30 16:43:22 +08:00
Jimmi Dyson
b5d8d0c991 Fix imports order 2015-11-27 21:52:29 +00:00
Rohit Jnagal
374e36d38e Ignore NaN values in collection.
We'll re-enable it when we have a better way in UI to handle these.
2015-08-17 23:24:19 +00:00
anushree-n
4c67b21c1d Add Prometheus Collector 2015-08-14 10:59:37 -07:00
anushree-n
04a78502ca Modify generic collector 2015-08-12 17:56:01 -07:00
Rohit Jnagal
dd0d0dd3b1 Add units and data type to spec for custom metrics.
Renamed units to data_type in collector config.
Use units for actual display units eg MB/s, "number of connections".
2015-07-30 06:11:17 +00:00
Rohit Jnagal
c0b3f779f5 Add custom metrics to spec.
Remove spec-related fields from stat.
We can simplify the stats a bit further by handling Int and Float better.
But this was big enough change already.
Verified v1 and v2 spec/stats/appmetrics APIs.
2015-07-25 20:17:54 +00:00
Rohit Jnagal
3f8e065947 Two small fixes to custom metric collection.
- a typo in minPollingFrequency multiplies it with time.Second twice.
- Updating custom metrics is unnecessarily called for all containers.
2015-07-23 01:56:07 +00:00
Rohit Jnagal
a123fd72d8 Add logic to read custom metric config files from container root.
Docker does not provide the rootfs path through docker inspect or statefile
and the path is dependent on the storage driver being used.

Instead of enumerating the storage drivers, we pick a pid from the container
and get the config from /proc/pid/root. Although a bit expensive, this method
works for non-docker containers too.
2015-07-22 15:45:07 +00:00
Rohit Jnagal
649fac9fc7 Merge pull request #815 from anushree-n/cache
Cache custom metrics
2015-07-20 13:04:59 -07:00
anushree-n
e2e193c1fd Add metrics caching 2015-07-20 11:24:20 -07:00
Rohit Jnagal
df4d8b1da8 Change logic for determining minimum polling frequency.
Since polling is tied to housekeeping, minimum supported polling
frequency is 1s.

Users can specify polling frequency higher than 1s. The polling loop
will be called at the minimum frequency specified in config as long as
its higher than the minimum supported frequency.
2015-07-20 15:57:03 +00:00
anushree-n
6871ed42d6 Modify Collect() method of GenericCollector 2015-07-18 09:49:52 -07:00
anushree-n
6cc9d44264 Implement Collect method of Collector interface 2015-07-14 11:06:55 -07:00
Rohit Jnagal
9e1101f020 Merge pull request #810 from anushree-n/modifyConfig
Modify Collector structure
2015-07-14 09:57:18 -07:00
anushree-n
4f83aae835 Include custom metrics in ContainerStats structure 2015-07-13 21:15:40 -07:00
anushree-n
1083213d22 Modify Collector structure 2015-07-10 14:55:55 -07:00
anushree-n
b4dcc3772a Add a generic config and collector for custom metrics 2015-07-06 19:07:39 -07:00
Victor Marmol
4fdd709717 Collectors export metrics from Collect(). 2015-05-11 12:26:51 -07:00
Victor Marmol
5b39a77318 Add generic collector runtimes 2015-05-04 15:57:18 -07:00