From 919558f601e60d797b02280a342b3a1f82b42f04 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Thu, 14 Jul 2016 09:54:10 +0900
Subject: [PATCH 1/3] config: remove deprecated `target_groups` configuration

---
 config/config.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/config/config.go b/config/config.go
index 079d546a6..c9074fd1b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -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 {

From ca7ab62f4096ad39c6db945c5bc45f8c868eeeea Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Thu, 14 Jul 2016 09:43:11 +0900
Subject: [PATCH 2/3] *: bump version to 1.0.0-rc.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 5a03fb737..49cd32599 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.20.0
+1.0.0-rc.0

From 1c4b3ab0e207b8e6771f8b251a8d51416173cf3b Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Thu, 14 Jul 2016 09:54:35 +0900
Subject: [PATCH 3/3] *: update changelog for version 1.0.0-rc.0

---
 CHANGELOG.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83abdb3dc..78b933c37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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.