mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-20 15:57:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'release-1.0' of github.com:prometheus/prometheus into release-1.0

Browse source
This commit is contained in:
Fabian Reinartz 2016-07-14 10:44:02 +09:00
parent e3f4df75a8 675b0184af
commit a6c81f32bc
3 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CHANGELOG.md
View file

@ -1,3 +1,22 @@
## 1.0.0-rc.0 / 2016-07-14
* [CHANGE] Remove deprecated query language keywords
* [CHANGE] Change Kubernetes SD to require specifying Kubernetes role
* [CHANGE] Use service address in Consul SD if available
* [CHANGE] Standardize all Prometheus internal metrics to second units
* [CHANGE] Remove unversioned legacy HTTP API
* [CHANGE] Remove legacy ingestion of JSON metric format
* [CHANGE] Remove deprecated `target_groups` configuration
* [FEATURE] Add binary power operation to PromQL
* [FEATURE] Add `count_values` aggregator
* [FEATURE] Add `-web.route-prefix` flag
* [FEATURE] Allow `on()`, `by()`, `without()` in PromQL with empty label sets
* [ENHANCEMENT] Make `topk/bottomk` query functions aggregators
* [BUGFIX] Fix annotations in alert rule printing
* [BUGFIX] Expand alert templating at evaluation time
* [BUGFIX] Fix edge case handling in crash recovery
* [BUGFIX] Hide testing package flags from help output
## 0.20.0 / 2016-06-15
This release contains multiple breaking changes to the configuration schema.

2
VERSION
View file

@ -1 +1 @@
0.20.0
1.0.0-rc.0

11
config/config.go
View file

@ -23,7 +23,6 @@ import (
"strings"
"time"
"github.com/prometheus/common/log"
"github.com/prometheus/common/model"
"gopkg.in/yaml.v2"
)
@ -409,8 +408,6 @@ type ScrapeConfig struct {
TLSConfig TLSConfig `yaml:"tls_config,omitempty"`
// List of labeled target groups for this job.
// XXX(fabxc): `target_groups` is deprecated.
TargetGroups []*TargetGroup `yaml:"target_groups,omitempty"`
StaticConfigs []*TargetGroup `yaml:"static_configs,omitempty"`
// List of DNS service discovery configurations.
DNSSDConfigs []*DNSSDConfig `yaml:"dns_sd_configs,omitempty"`
@ -460,14 +457,6 @@ func (c *ScrapeConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
if c.BasicAuth != nil && (len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0) {
return fmt.Errorf("at most one of basic_auth, bearer_token & bearer_token_file must be configured")
}
// Check `target_groups` deprecation.
if c.TargetGroups != nil && c.StaticConfigs != nil {
return fmt.Errorf("'target_groups' is deprecated, configure static targets via 'static_configs' only")
}
if c.TargetGroups != nil {
log.Warnf("The 'target_groups' option for scrape configurations is deprecated, use 'static_configs' instead")
c.StaticConfigs = c.TargetGroups
}
// Check for users putting URLs in target groups.
if len(c.RelabelConfigs) == 0 {
for _, tg := range c.StaticConfigs {