Updating Kubernetes check to handle multiple namespaces fix #2838 #3028
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hush-hush
force-pushed
the
maxime/kubernetes-namespaces
branch
from
75724aa
to
6d8e04c
Compare
hkaj
reviewed
Nov 18, 2016
| @@ -423,16 +423,43 @@ def _process_events(self, instance, pods_list): | |||
| node_ip, node_name = self.kubeutil.get_node_info() | |||
| self.log.debug('Processing events on {} [{}]'.format(node_name, node_ip)) | |||
|
|
|||
| k8s_namespace = instance.get('namespace', 'default') | |||
| events_endpoint = '{}/namespaces/{}/events'.format(self.kubeutil.kubernetes_api_url, k8s_namespace) | |||
| default_namespaces = ['default'] | |||
| k8s_namespaces = default_namespaces | ||
|
|
||
| # handle old config value | ||
| if 'namespace' in instance and instance.get('namespace') not in (None, 'default'): |
There was a problem hiding this comment.
I think we should add a log.warning with a deprecation notice here and get rid of it in a couple versions. This is a quick & easy change for the customer and shouldn't be too damaging if they forget.
This way we'll be able to get rid of the special case later.
Eg:
if 'namespace' in instance and instance.get('namespace') not in (None, 'default'):
self.log.warning('''The namespace parameter is deprecated and will stop being supported starting '''
'''from 5.12. Please use namespaces and/or namespace_name_regexp instead.''')| k8s_namespace_regexp = instance.get('namespace_name_regexp', None) | ||
| if k8s_namespace_regexp: | ||
| try: | ||
| regexp = re.compile(k8s_namespace_regexp) |
There was a problem hiding this comment.
if we compile it, let's do it in __init__ to avoid redoing it at each check run.
|
|
||
| # The regexp used to select namespaces for which events should be collected. | ||
| # The matched namespaces will be added to the "namespaces" list. | ||
| # If empty, regexp selection will be ignore. |
The configuration key 'namespace' is renamed 'namespaces' so multiple names can be specified (if present the old key will be added to the 'namespaces' list). A new configuration key 'namespace_name_regexp' is added to allow namespaces selection using regexp. We now pull every event from Kubernetes and filter them the namespace list.
hush-hush
force-pushed
the
maxime/kubernetes-namespaces
branch
from
6d8e04c
to
69debde
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR allows the agent to collect events from multiple Kubernetes namespaces by using a list of names and/or a regexp.
Two new configuration keys are added:
'namespaces': a list of names
'namespace_name_regexp': a regexp to match any namespace
Additional Notes
The old configuration value 'namespace' is still handled by the agent: if present it is added to the 'namespaces' list.