diff --git a/docs/TIME.md b/docs/TIME.md index 4f0b01a0..4eecf7d6 100644 --- a/docs/TIME.md +++ b/docs/TIME.md @@ -4,7 +4,7 @@ NOTE: This collector is deprecated and will be removed in the next major version release. -This collector is intended for usage with local NTP daemons including [ntp.org](http://ntp.org/), [chrony](https://chrony.tuxfamily.org/comparison.html), and [OpenNTPD](http://www.openntpd.org/). +This collector is intended for use with local NTP daemons including [ntp.org](http://ntp.org/), [chrony](https://chrony.tuxfamily.org/comparison.html), and [OpenNTPD](http://www.openntpd.org/). Note, some chrony packages have `local stratum 10` configuration value making chrony a valid server when it is unsynchronised. This configuration makes one of the heuristics that derive `node_ntp_sanity` unreliable. diff --git a/docs/V0_16_UPGRADE_GUIDE.md b/docs/V0_16_UPGRADE_GUIDE.md index 0a8bf24e..120d9775 100644 --- a/docs/V0_16_UPGRADE_GUIDE.md +++ b/docs/V0_16_UPGRADE_GUIDE.md @@ -14,7 +14,7 @@ We have provided a [sample recording rule set that translates old metrics to new ## Run both old and new versions simultaneously. -It's possible to run both the old and new exporter on different ports, and include an additional scrape job in Prometheus. It's recommended to enable only the collectors that have name changes that you care about. +It's possible to run both the old and new exporter on different ports, and include an additional scrape job in Prometheus. We recommend enabling only the collectors whose name changes matter to you. [naming best practices]: https://prometheus.io/docs/practices/naming/ [sample recording rule set that translates old metrics to new ones]: example-16-compatibility-rules.yml diff --git a/docs/node-mixin/config.libsonnet b/docs/node-mixin/config.libsonnet index ea31b595..088ccbb6 100644 --- a/docs/node-mixin/config.libsonnet +++ b/docs/node-mixin/config.libsonnet @@ -39,7 +39,7 @@ // Some of the alerts are meant to fire if a critical failure of a // node is imminent (e.g. the disk is about to run full). In a - // true “cloud native” setup, failures of a single node should be + // true “cloud native” deployment, failures of a single node should be // tolerated. Hence, even imminent failure of a single node is no // reason to create a paging alert. However, in practice there are // still many situations where operators like to get paged in time diff --git a/end-to-end-test.sh b/end-to-end-test.sh index e8357ea8..5ea7c715 100755 --- a/end-to-end-test.sh +++ b/end-to-end-test.sh @@ -313,10 +313,10 @@ trap finish EXIT get() { if command -v curl > /dev/null 2>&1 then - curl -s -f "$@" + curl -k -s -f "$@" elif command -v wget > /dev/null 2>&1 then - wget -O - "$@" + wget --no-check-certificate -qO - "$@" else echo "Neither curl nor wget found" exit 1