Commit Graph

2186 Commits

Author SHA1 Message Date
Tim St. Clair
3f51b8c861
Cherrypick release v0.23.8 2016-09-19 10:53:54 -07:00
Dawn Chen
2003ebe46c
Cherry-pick release:
- Check for thin_is binary in path for devicemapper when using ThinPoolWatcher
  - Fix uint64 overflow issue for CPU stats
2016-09-19 10:53:26 -07:00
Tim St. Clair
bddfb5f7ca
Release v0.23.3 2016-09-19 10:53:00 -07:00
Vish Kannan
d7a44cb1a2 Merge pull request #1456 from timstclair/cloud-api
Cherrypick #1455: Fix google cloud godeps
2016-09-13 15:24:18 -07:00
Tim St. Clair
e7576e5790
Moved google.golang.org/cloud/compute/metadata to cloud.google.com/go/compute/metadata 2016-09-13 13:59:03 -07:00
Vish Kannan
257173442c Merge pull request #1453 from timstclair/release-script
Allow alpha/beta tagged releases
2016-09-13 12:32:47 -07:00
Tim St. Clair
96d7e923ee
Allow alpha/beta tagged releases 2016-09-13 12:06:28 -07:00
Tim St. Clair
2a94462f03 Merge pull request #1446 from FlyingShit-XinHuang/master
Fix an error in 'application_metrics.md'
2016-09-06 11:52:51 -07:00
Tim St. Clair
552ae82e3f Merge pull request #1448 from vladgolubev/patch-1
Cosmetic styling change: break long words in container name title
2016-09-06 12:34:05 -04:00
Vlad Holubiev
82e9b1aa37 Styling: break long words in container name title 2016-09-06 14:06:53 +03:00
Xin Huang
0c335a32ea Fix an error in 'application_metrics.md'
There is a minor mistake of Dockerfile example
2016-09-06 15:05:34 +08:00
Tim St. Clair
bea0adbc86 Merge pull request #1437 from micahhausler/inodes-metric
Add inodes to /metrics endpoint
2016-08-29 10:49:07 -07:00
Micah Hausler
a9bb292b52 Add inodes to /metrics endpoint 2016-08-27 18:39:53 -04:00
Tim St. Clair
cd360d66e2 Merge pull request #1429 from grobie/grobie/container-label-filter
Provide option to control Prometheus labels
2016-08-22 15:32:10 -07:00
Tim St. Clair
751e6668bb Merge pull request #1430 from grobie/grobie/update-prometheus-url
Update prometheus.io URL
2016-08-22 14:32:25 -07:00
Tobias Schmidt
e76096d4f6 Provide option to control Prometheus labels
This change generalizes the existing ContainerNameToLabelsFunc to allow the user to fully control all labels attached to exported Prometheus metrics. The existing behavior is available as DefaultContainerLabelsFunc and is used if no custom function is provided.

This will allow Kubernetes to filter out its internal Docker labels.
2016-08-22 17:26:36 -04:00
Tobias Schmidt
82ce4ff6fc Update prometheus.io URL 2016-08-21 00:21:15 -04:00
Tim St. Clair
2ed7198f77 Merge pull request #1423 from chenchun/memory_reservation
GetSpec missing memory reservation
2016-08-16 17:37:08 -07:00
Chun Chen
844c98e073 GetSpec missing memory reservation 2016-08-16 23:26:46 +08:00
Tim St. Clair
6213bfab8d Merge pull request #1309 from f0/master
add cgropu swap usage and export as prometheus metric
2016-08-09 10:08:15 -07:00
Florian Koch
3ce98a46c4 add cgropu swap usage and export as prometheus metric 2016-08-09 07:33:37 +02:00
Vish Kannan
b1d8f6f900 Merge pull request #1386 from grobie/grobie/cpu-cfs-metrics
Expose cpu cgroup CFS prometheus metrics
2016-08-08 14:08:56 -07:00
Tobias Schmidt
1653733ea7 Expose cpu cgroup CFS prometheus metrics
If CPU quota is configured (cpu.cfs_quota != -1) the CFS will provide
stats about elapsed periods and throtting in cpu.stats. This change
makes these information available as container_cpu_cfs_* metrics.
2016-08-06 18:08:26 -04:00
Vish Kannan
f7a30e0b43 Merge pull request #1407 from timstclair/dockerfile
Update Dockerfile and dependencies
2016-08-05 17:22:36 -07:00
Tim St. Clair
8fa31bc627 Merge pull request #1411 from ncdc/thin-ls-kernel-check
Ensure minimum kernel version for thin_ls
2016-08-04 13:20:09 -07:00
Andy Goldstein
2b525ff87e Ensure minimum kernel version for thin_ls
Ensure that kernel >= 4.4.0 or RHEL/Centos 7 kernel >= 3.10.0-366 exists before starting the thin
pool watcher. Prior versions have a bug in which reserving and releasing the metadata snapshot can
cause thin pool corruption.
2016-08-04 16:14:40 -04:00
Tim St. Clair
4530a1c7c6
Update Dockerfile and dependencies
- Update base image to alpine:3.4
- Fix zfs-utils reference (moved to zfs in main)
- Update glibc version to 2.23-r3
2016-08-02 15:30:02 -07:00
Tim St. Clair
c6c06d440a Merge pull request #1365 from derekwaynecarr/expose_total_inodes
Expose total inodes
2016-08-02 10:56:24 -07:00
derekwaynecarr
6c114be580 Expose total inodes 2016-08-02 10:47:51 -04:00
Brent Hughes
e9f8dd31bb Added CPU Usage details to statsd (#1393)
* Added CPU Usage details to statsd

* Fixed bad path to load average

* Fixed some issues with formatting and types. This is now tested

* Updated to make load average follow the same schema as other cpu metrics
2016-08-01 17:01:10 -07:00
Tim St. Clair
a40e0923a0 Merge pull request #1402 from jimmidyson/prometheus-docker-labels
Prefix Docker labels & env vars in Prometheus metrics to prevent conflicts
2016-08-01 13:38:59 -07:00
Jimmi Dyson
f1d8b2da70
Prefix Docker labels & env vars in Prometheus metrics to prevent conflicts 2016-08-01 21:33:31 +01:00
Tim St. Clair
bbe54c0a10 Merge pull request #1368 from derekwaynecarr/inodes_pointer
Allow clients to know if inodes data is available
2016-07-29 10:10:30 -07:00
Vish Kannan
8fc0cdbb85 Merge pull request #1359 from ncdc/thin-pool-watcher-logging
Make ThinPoolWatcher loglevel consistent
2016-07-28 09:56:08 -07:00
derekwaynecarr
cccf9d5fec Allow clients to know if inodes are supported on a filesystem 2016-07-26 11:15:07 -04:00
Vish Kannan
04f73fefa5 Merge pull request #1395 from derekwaynecarr/cadvisor_wrong_values
filesystem usage stats are wrong in v2 api
2016-07-25 14:41:56 -07:00
derekwaynecarr
8551b0ebf7 filesystem usage stats are wrong in v2 api 2016-07-25 17:33:26 -04:00
Andy Goldstein
d05098b314 Lower ThinPoolWatcher cache miss log level 2016-07-23 07:07:42 -04:00
Andy Goldstein
b4cd05b879 Make ThinPoolWatcher loglevel consistent 2016-07-23 07:07:42 -04:00
Tim St. Clair
fe765981c2 Merge pull request #1391 from atombender/fix_prometheus_scrape_error_gauge
Fix for Prometheus metric "container_scrape_errors" getting stuck
2016-07-21 18:21:24 -07:00
Alexander Staubo
f8f474e791 This fixes a bug where any errors encountered during Prometheus metric
collection would stay counted in the gauge "container_scrape_errors",
making that particular metric useless. Instead, it must be reset on
every scrape.
2016-07-21 20:04:21 -04:00
Tim St. Clair
552d2578ec Merge pull request #1379 from mwringe/collector_httpclient
Update collectors to use a customized httpClient.
2016-07-21 13:15:49 -07:00
mwringe
b8b541d86a Update collectors to use a customized httpClient. 2016-07-21 16:00:21 -04:00
Vish Kannan
e47efa0e8a Merge pull request #1390 from Random-Liu/bump-up-go-systemd
Bump up go-systemd to 4484981625c1a6a2ecb40a390fcb6a9bcfee76e3.
2016-07-21 11:04:02 -07:00
Lantao Liu
b351411510 Bump up go-systemd to 4484981625c1a6a2ecb40a390fcb6a9bcfee76e3. 2016-07-20 20:41:21 -07:00
Vish Kannan
533e6704d8 Merge pull request #1388 from vishh/docker-bump
Update docker to v1.11.2
2016-07-19 16:59:18 -07:00
Vishnu kannan
d4ce3dccdd update docker to v1.11.2
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-19 16:55:05 -07:00
Tim St. Clair
734db4c437 Merge pull request #1387 from vishh/runc-bump
Update libcontainer deps
2016-07-19 12:45:32 -07:00
Vishnu kannan
4c0d60d9de update libcontainer deps
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-07-19 12:35:14 -07:00
Tim St. Clair
510e6e8bfd Merge pull request #1381 from Random-Liu/fix-watch-error
Continue watching other sub directories when there is watch error.
2016-07-18 18:24:06 -07:00