Merge branch 'release-1.0'

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.0.0-rc.0 / 2016-07-14
+## 1.0.0 / 2016-07-18
 
 * [CHANGE] Remove deprecated query language keywords
 * [CHANGE] Change Kubernetes SD to require specifying Kubernetes role

VERSION

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

config/config.go

@@ -781,7 +781,7 @@ func (c *MarathonSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) erro
 // KubernetesSDConfig is the configuration for Kubernetes service discovery.
 type KubernetesSDConfig struct {
 	APIServers      []URL          `yaml:"api_servers"`
-	Role            string         `yaml:"role"`
+	Role            KubernetesRole `yaml:"role"`
 	InCluster       bool           `yaml:"in_cluster,omitempty"`
 	BasicAuth       *BasicAuth     `yaml:"basic_auth,omitempty"`
 	BearerToken     string         `yaml:"bearer_token,omitempty"`
@@ -813,7 +813,7 @@ func (c *KubernetesRole) UnmarshalYAML(unmarshal func(interface{}) error) error
 	case KubernetesRoleNode, KubernetesRolePod, KubernetesRoleContainer, KubernetesRoleService, KubernetesRoleEndpoint, KubernetesRoleAPIServer:
 		return nil
 	default:
-		return fmt.Errorf("Unknown Kubernetes SD role %q", c)
+		return fmt.Errorf("Unknown Kubernetes SD role %q", *c)
 	}
 }
 

config/config_test.go

@@ -385,6 +385,9 @@ var expectedErrors = []struct {
 	}, {
 		filename: "kubernetes_bearertoken.bad.yml",
 		errMsg:   "at most one of bearer_token & bearer_token_file must be configured",
+	}, {
+		filename: "kubernetes_role.bad.yml",
+		errMsg:   "role",
 	}, {
 		filename: "kubernetes_bearertoken_basicauth.bad.yml",
 		errMsg:   "at most one of basic_auth, bearer_token & bearer_token_file must be configured",

config/testdata/kubernetes_role.bad.yml

@@ -0,0 +1,5 @@
+scrape_configs:
+- kubernetes_sd_configs:
+  - api_server: kubernetes:443
+    role: vacation
+