2305 Commits (288964eeaf58b352c6ed7d3dc255f7dcec9d89f5)

 

All Branches   

Search

Author	SHA1	Message	Date
Julius Volz	288964eeaf	Merge pull request #1151 from prometheus/fix-sd-source-handling ... Fix SD mechanism source prefix handling.	9 years ago
Julius Volz	d88aea7e6f	Fix SD mechanism source prefix handling. ... The prefixed target provider changed a pointerized target group that was reused in the wrapped target provider, causing an ever-increasing chain of source prefixes in target groups from the Consul target provider. We now make this bug generally impossible by switching the target group channel from pointer to value type and thus ensuring that target groups are copied before being passed on to other parts of the system. I tried to not let the depointerization leak too far outside of the channel handling (both upstream and downstream) because I tried that initially and caused some nasty bugs, which I want to minimize. Fixes https://github.com/prometheus/prometheus/issues/1083	9 years ago
Julius Volz	0088aa4d45	Merge pull request #1132 from prometheus/fix-quoting-and-escaping ... Support escape sequences in strings and add raw strings	9 years ago
Julius Volz	dec9fc9c32	Merge pull request #1148 from prometheus/fix-serverset-multiple-paths ... Fix watching multiple Zookeeper paths in serverset SD.	9 years ago
Julius Volz	46c5260761	Support escape sequences in strings and add raw strings. ... This adapts some functionality from the Go standard library for string literal lexing and unquoting/unescaping. The following string types are now supported: Double- or single-quoted strings: These support all escape sequences that Go supports in double-quoted string literals. The difference is that Prometheus also has single-quoted strings (instead of single-quoted runes in Go). Raw newlines are not allowed. Backtick-quoted raw strings: Strings quoted in backticks are treated as raw strings just like in Go and may contain raw newlines and other special characters directly. Fixes https://github.com/prometheus/prometheus/issues/1122 Fixes https://github.com/prometheus/prometheus/issues/1121	9 years ago
Fabian Reinartz	9cba38c6da	Merge pull request #1150 from prometheus/kerckhoff-principle ... config: Don't hide username, it's not secret.	9 years ago
Brian Brazil	1ddf75240d	config: Don't hide username, it's not secret. ... Usernames are not generally considered to be secrets, and treating them as secrets may lead to confusion as to how secure they are. Obscuring them also makes debugging harder.	9 years ago
Fabian Reinartz	be8b83f48f	Merge pull request #1085 from mjibson/elb ... Add SD for Amazon EC2 instances	9 years ago
Matt Jibson	5ba5a31e12	vendor EC2 dependencies	9 years ago
Matt Jibson	dcb4856d72	Add SD for Amazon EC2 instances	9 years ago
Julius Volz	60cf4015a4	Fix watching multiple Zookeeper paths in serverset SD. ... Fix https://github.com/prometheus/prometheus/issues/1137	9 years ago
Fabian Reinartz	5ebef5c025	Merge pull request #1144 from roymiloh/master ... Remove duplicated bootstrap js on the graph template	9 years ago
Fabian Reinartz	3e48226e7b	Merge pull request #1145 from prometheus/feder ... consoles: Remove federation example.	9 years ago
Brian Brazil	c3adc9a393	consoles: Remove federation example. ... Now that federation is a 1st class feature, there's no reason to keep this around.	9 years ago
Roy Miloh	189416cb34	Remove duplicated bootstrap js on the graph template, it's already included on the base template.	9 years ago
Fabian Reinartz	b0aa877868	Merge pull request #1141 from prometheus/log ... Switch to common/log	9 years ago
Fabian Reinartz	e3b6ec9784	Switch to common/log	9 years ago
Brian Brazil	91436b2974	Merge pull request #1140 from thachmai/master ... Fix example prometheus.yml to use "external_labels" instead of "labels"	9 years ago
Thach MAI	94f4430ff3	Fix example prometheus.yml to use "external_labels" instead of "labels".	9 years ago
Brian Brazil	5caa70ee28	Merge pull request #1138 from prometheus/brian-brazil-patch-1 ... Mention hactoberfest	9 years ago
Brian Brazil	4b209aa384	Mention Hacktoberfest ... As DigitalOcean is linking to this page, direct users to the project list from here.	9 years ago
Julius Volz	d025fcd4e2	Merge pull request #1133 from prometheus/escape-string-values ... HTML-escape string return values in web UI.	9 years ago
Julius Volz	3008a35c04	HTML-escape string return values in web UI. ... Querying for the string literal "<script>alert(1)</script>" would alert otherwise.	9 years ago
Julius Volz	7e86cd1ef4	Add Unquote() strutil function.	9 years ago
Julius Volz	ea7c077e81	Merge pull request #1131 from prometheus/fix-node-disk-mountpoint ... Rename label 'filesystem'->'mountpoint' in node-cpu console.	9 years ago
Julius Volz	f4e1f6e3b9	Rename label 'filesystem'->'mountpoint' in node-cpu console. ... The label name has been changed in the node exporter.	9 years ago
Fabian Reinartz	e1b9146c38	Add missing 'g'	9 years ago
Julius Volz	24ff06b145	CHANGELOG.md formatting fixes for 0.16.0rc2 entry	9 years ago
Fabian Reinartz	e7c60c2b1d	Merge pull request #1130 from prometheus/rc ... Cut release 0.16.0rc2	9 years ago
Fabian Reinartz	85ac8d0e5d	Cut release 0.16.0rc2	9 years ago
Julius Volz	db382b4570	Merge pull request #1129 from prometheus/rename-global-labels ... Rename global "labels" config option to "external_labels".	9 years ago
Julius Volz	4dbb3abfec	Merge pull request #1127 from fabric8io/kubernetes-discovery ... Add Kubernetes namespace & name labels to example config	9 years ago
Julius Volz	dac26cef71	Rename global "labels" config option to "external_labels".	9 years ago
Jimmi Dyson	1976dfe634	Add Kubernetes namespace & name labels to example config	9 years ago
Julius Volz	bf4e4a8ff0	Merge pull request #1125 from fabric8io/kubernetes-discovery ... Kubernetes SD example: separate out cluster level components & services	9 years ago
Jimmi Dyson	0d61605526	Kubernetes SD example: separate out cluster level components & services	9 years ago
Jimmi Dyson	e26fc5e73c	Kubernetes SD config tidy & add labelmap action example	9 years ago
Brian Brazil	a88ed8c2ff	Merge pull request #1123 from keegancsmith/k8s-example ... Move InCluster auth in kubernetes example config	9 years ago
Keegan Carruthers-Smith	e633b1dc8d	Move InCluster auth in kubernetes example config ... CA and Bearer Token are config of `kubernetes_sd_configs`, not the `scrape_config`. Also updated misleading top-level comment and removed unnecessary global config.	9 years ago
Julius Volz	e91d85b498	Merge pull request #1116 from prometheus/fix-tm-done ... Fix target manager CPU busyloop caused by bad done-channel handling.	9 years ago
Julius Volz	99e8fff872	Fix target manager CPU busyloop caused by bad done-channel handling. ... Unfortunately this isn't nicely testable, as it's timing-dependent and one would have to detect a stray goroutine doing a CPU busyloop... Fixes https://github.com/prometheus/prometheus/issues/1114	9 years ago
Fabian Reinartz	097d810f37	Merge pull request #1120 from prometheus/flaky-test ... retrieval: Reduce flakiness of TestTargetRunScraperScrapes	9 years ago
Brian Brazil	ba6688bfce	retrieval: Reduce flakiness of TestTargetRunScraperScrapes	9 years ago
Brian Brazil	19d9e3609b	Merge pull request #1118 from prometheus/params-lost ... retrieval: Add URL parameters to fullLabels too	9 years ago
Brian Brazil	b03569267e	retrieval: Add URL parameters to fullLabels too ... Move all the special cases into one map, rather than spreading the logic around.	9 years ago
Fabian Reinartz	656b2e2109	Merge pull request #1113 from prometheus/router ... Switch to common/route package	9 years ago
Fabian Reinartz	398bbf906b	Switch to common/route package	9 years ago
Fabian Reinartz	666eafc23b	Merge pull request #1108 from prometheus/fix-prefixed-redirect ... Fix / -> /graph redirect when using a path prefix.	9 years ago
Julius Volz	0179bbfe03	Fix / -> /graph redirect when using a path prefix.	9 years ago
Brian Brazil	21979c4b95	Merge pull request #1112 from prometheus/flaky-tests ... promql: Reduce flakiness of concurrency test	9 years ago