CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.kube_inventory): Change default token path, use in-cluster config by default (#12284)

This commit is contained in:
Maxim Ivanov 2022-12-09 15:58:14 +00:00 committed by GitHub
parent df3b23de3a
commit 95bdcbb7d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/telegraf.conf
View File

@ -5436,11 +5436,11 @@
# ## Use bearer token for authorization. ('bearer_token' takes priority) # ## Use bearer token for authorization. ('bearer_token' takes priority)
# ## # ##
# ## If both of these are empty, we'll use the default serviceaccount: # ## If both of these are empty, we'll use the default serviceaccount:
# ## at: /run/secrets/kubernetes.io/serviceaccount/token # ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
# ## # ##
# ## To auto-refresh the token, please use a file with the bearer_token option. # ## To auto-refresh the token, please use a file with the bearer_token option.
# ## If given a string, Telegraf cannot refresh the token periodically. # ## If given a string, Telegraf cannot refresh the token periodically.
# # bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
# ## OR # ## OR
# ## deprecated in 1.24.0; use bearer_token with a file # ## deprecated in 1.24.0; use bearer_token with a file
# # bearer_token_string = "abc_123" # # bearer_token_string = "abc_123"
@ -5488,12 +5488,12 @@
# #
# ## Use bearer token for authorization. ('bearer_token' takes priority) # ## Use bearer token for authorization. ('bearer_token' takes priority)
# ## If both of these are empty, we'll use the default serviceaccount: # ## If both of these are empty, we'll use the default serviceaccount:
# ## at: /run/secrets/kubernetes.io/serviceaccount/token # ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
# ## # ##
# ## To re-read the token at each interval, please use a file with the # ## To re-read the token at each interval, please use a file with the
# ## bearer_token option. If given a string, Telegraf will always use that # ## bearer_token option. If given a string, Telegraf will always use that
# ## token. # ## token.
# # bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
# ## OR # ## OR
# # bearer_token_string = "abc_123" # # bearer_token_string = "abc_123"
# #

8
etc/telegraf_windows.conf
View File

@ -5269,11 +5269,11 @@
# ## Use bearer token for authorization. ('bearer_token' takes priority) # ## Use bearer token for authorization. ('bearer_token' takes priority)
# ## # ##
# ## If both of these are empty, we'll use the default serviceaccount: # ## If both of these are empty, we'll use the default serviceaccount:
# ## at: /run/secrets/kubernetes.io/serviceaccount/token # ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
# ## # ##
# ## To auto-refresh the token, please use a file with the bearer_token option. # ## To auto-refresh the token, please use a file with the bearer_token option.
# ## If given a string, Telegraf cannot refresh the token periodically. # ## If given a string, Telegraf cannot refresh the token periodically.
# # bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
# ## OR # ## OR
# ## deprecated in 1.24.0; use bearer_token with a file # ## deprecated in 1.24.0; use bearer_token with a file
# # bearer_token_string = "abc_123" # # bearer_token_string = "abc_123"
@ -5321,12 +5321,12 @@
# #
# ## Use bearer token for authorization. ('bearer_token' takes priority) # ## Use bearer token for authorization. ('bearer_token' takes priority)
# ## If both of these are empty, we'll use the default serviceaccount: # ## If both of these are empty, we'll use the default serviceaccount:
# ## at: /run/secrets/kubernetes.io/serviceaccount/token # ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
# ## # ##
# ## To re-read the token at each interval, please use a file with the # ## To re-read the token at each interval, please use a file with the
# ## bearer_token option. If given a string, Telegraf will always use that # ## bearer_token option. If given a string, Telegraf will always use that
# ## token. # ## token.
# # bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
# ## OR # ## OR
# # bearer_token_string = "abc_123" # # bearer_token_string = "abc_123"
# #

11
plugins/inputs/kube_inventory/README.md
View File

@ -47,20 +47,23 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
```toml @sample.conf ```toml @sample.conf
# Read metrics from the Kubernetes api # Read metrics from the Kubernetes api
[[inputs.kube_inventory]] [[inputs.kube_inventory]]
## URL for the Kubernetes API ## URL for the Kubernetes API.
url = "https://127.0.0.1" ## If empty in-cluster config with POD's service account token will be used.
# url = ""
## Namespace to use. Set to "" to use all namespaces. ## Namespace to use. Set to "" to use all namespaces.
# namespace = "default" # namespace = "default"
## Use bearer token for authorization. ('bearer_token' takes priority) ## Use bearer token for authorization. ('bearer_token' takes priority)
## ##
## Ignored if url is empty and in-cluster config is used.
##
## If both of these are empty, we'll use the default serviceaccount: ## If both of these are empty, we'll use the default serviceaccount:
## at: /run/secrets/kubernetes.io/serviceaccount/token ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
## ##
## To auto-refresh the token, please use a file with the bearer_token option. ## To auto-refresh the token, please use a file with the bearer_token option.
## If given a string, Telegraf cannot refresh the token periodically. ## If given a string, Telegraf cannot refresh the token periodically.
# bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
## OR ## OR
## deprecated in 1.24.0; use bearer_token with a file ## deprecated in 1.24.0; use bearer_token with a file
# bearer_token_string = "abc_123" # bearer_token_string = "abc_123"

40
plugins/inputs/kube_inventory/client.go
View File

@ -21,22 +21,32 @@ type client struct {
} }
func newClient(baseURL, namespace, bearerTokenFile string, bearerToken string, timeout time.Duration, tlsConfig tls.ClientConfig) (*client, error) { func newClient(baseURL, namespace, bearerTokenFile string, bearerToken string, timeout time.Duration, tlsConfig tls.ClientConfig) (*client, error) {
config := &rest.Config{ var config *rest.Config
TLSClientConfig: rest.TLSClientConfig{ var err error
ServerName: tlsConfig.ServerName,
Insecure: tlsConfig.InsecureSkipVerify,
CAFile: tlsConfig.TLSCA,
CertFile: tlsConfig.TLSCert,
KeyFile: tlsConfig.TLSKey,
},
Host: baseURL,
ContentConfig: rest.ContentConfig{},
}
if bearerTokenFile != "" { if baseURL == "" {
config.BearerTokenFile = bearerTokenFile config, err = rest.InClusterConfig()
} else if bearerToken != "" { if err != nil {
config.BearerToken = bearerToken return nil, err
}
} else {
config = &rest.Config{
TLSClientConfig: rest.TLSClientConfig{
ServerName: tlsConfig.ServerName,
Insecure: tlsConfig.InsecureSkipVerify,
CAFile: tlsConfig.TLSCA,
CertFile: tlsConfig.TLSCert,
KeyFile: tlsConfig.TLSKey,
},
Host: baseURL,
ContentConfig: rest.ContentConfig{},
}
if bearerTokenFile != "" {
config.BearerTokenFile = bearerTokenFile
} else if bearerToken != "" {
config.BearerToken = bearerToken
}
} }
c, err := kubernetes.NewForConfig(config) c, err := kubernetes.NewForConfig(config)

2
plugins/inputs/kube_inventory/kube_inventory.go
View File

@ -22,7 +22,7 @@ import (
var sampleConfig string var sampleConfig string
const ( const (
defaultServiceAccountPath = "/run/secrets/kubernetes.io/serviceaccount/token" defaultServiceAccountPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
) )
// KubernetesInventory represents the config object for the plugin. // KubernetesInventory represents the config object for the plugin.

11
plugins/inputs/kube_inventory/sample.conf
View File

@ -1,19 +1,22 @@
# Read metrics from the Kubernetes api # Read metrics from the Kubernetes api
[[inputs.kube_inventory]] [[inputs.kube_inventory]]
## URL for the Kubernetes API ## URL for the Kubernetes API.
url = "https://127.0.0.1" ## If empty in-cluster config with POD's service account token will be used.
# url = ""
## Namespace to use. Set to "" to use all namespaces. ## Namespace to use. Set to "" to use all namespaces.
# namespace = "default" # namespace = "default"
## Use bearer token for authorization. ('bearer_token' takes priority) ## Use bearer token for authorization. ('bearer_token' takes priority)
## ##
## Ignored if url is empty and in-cluster config is used.
##
## If both of these are empty, we'll use the default serviceaccount: ## If both of these are empty, we'll use the default serviceaccount:
## at: /run/secrets/kubernetes.io/serviceaccount/token ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
## ##
## To auto-refresh the token, please use a file with the bearer_token option. ## To auto-refresh the token, please use a file with the bearer_token option.
## If given a string, Telegraf cannot refresh the token periodically. ## If given a string, Telegraf cannot refresh the token periodically.
# bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
## OR ## OR
## deprecated in 1.24.0; use bearer_token with a file ## deprecated in 1.24.0; use bearer_token with a file
# bearer_token_string = "abc_123" # bearer_token_string = "abc_123"

4
plugins/inputs/kubernetes/README.md
View File

@ -53,12 +53,12 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
## Use bearer token for authorization. ('bearer_token' takes priority) ## Use bearer token for authorization. ('bearer_token' takes priority)
## If both of these are empty, we'll use the default serviceaccount: ## If both of these are empty, we'll use the default serviceaccount:
## at: /run/secrets/kubernetes.io/serviceaccount/token ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
## ##
## To re-read the token at each interval, please use a file with the ## To re-read the token at each interval, please use a file with the
## bearer_token option. If given a string, Telegraf will always use that ## bearer_token option. If given a string, Telegraf will always use that
## token. ## token.
# bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
## OR ## OR
# bearer_token_string = "abc_123" # bearer_token_string = "abc_123"

2
plugins/inputs/kubernetes/kubernetes.go
View File

@ -50,7 +50,7 @@ type Kubernetes struct {
} }
const ( const (
defaultServiceAccountPath = "/run/secrets/kubernetes.io/serviceaccount/token" defaultServiceAccountPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
) )
func init() { func init() {

4
plugins/inputs/kubernetes/sample.conf
View File

@ -5,12 +5,12 @@
## Use bearer token for authorization. ('bearer_token' takes priority) ## Use bearer token for authorization. ('bearer_token' takes priority)
## If both of these are empty, we'll use the default serviceaccount: ## If both of these are empty, we'll use the default serviceaccount:
## at: /run/secrets/kubernetes.io/serviceaccount/token ## at: /var/run/secrets/kubernetes.io/serviceaccount/token
## ##
## To re-read the token at each interval, please use a file with the ## To re-read the token at each interval, please use a file with the
## bearer_token option. If given a string, Telegraf will always use that ## bearer_token option. If given a string, Telegraf will always use that
## token. ## token.
# bearer_token = "/run/secrets/kubernetes.io/serviceaccount/token" # bearer_token = "/var/run/secrets/kubernetes.io/serviceaccount/token"
## OR ## OR
# bearer_token_string = "abc_123" # bearer_token_string = "abc_123"