Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add arbitray system log support #88

Merged
merged 3 commits into from
Feb 15, 2017

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Feb 3, 2017

For #44.

Based on #81.

This PR:

  • Add PluginConfig for plugin specific configuration.
  • Add source in journald plugin configuration to make sdjournal SYSTEM_IDENTIFIER configurable.
  • Add timestamp regular expression, message regular expression and timestampFormat configuration in syslog plugin configuration. (We plan to change this to be filelog, because it can handle not only syslog)

TODOs for this work:

  • Add multiple configuration files support. NPD should start a system log monitor for each passed in configurtion, so that it can monitor different services at the same time.
  • Rename syslog to filelog.
  • Rename kernel monitor to system log monitor, change all "kernel" reference in the code.
  • Optimize the efficiency to make the system log monitor more light weight.
  • Add document for the new behavior.
  • Update kubernetes e2e test to test the new behavior.

/cc @dchen1107 @kubernetes/node-problem-detector-reviewers


This change is Reviewable

@Random-Liu Random-Liu added this to the Kubernetes v1.6 milestone Feb 3, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 3, 2017
@Random-Liu Random-Liu mentioned this pull request Feb 3, 2017
11 tasks
@Random-Liu
Copy link
Member Author

I've updated the e2e test locally according the change in this PR, and the PR passed the test.

Will update the e2e test in Kubernetes repo after this PR is merged.

@dchen1107
Copy link
Member

Can you rebased this one? #81 was merged, and I am reviewing this one today.

@Random-Liu Random-Liu changed the title Add arbitray log support Add arbitray daemon log support Feb 10, 2017
@Random-Liu
Copy link
Member Author

@dchen1107 Rebased. :)

@Random-Liu Random-Liu changed the title Add arbitray daemon log support Add arbitray system log support Feb 15, 2017
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 merged commit 6e35bcf into kubernetes:master Feb 15, 2017
@Random-Liu Random-Liu deleted the add-arbitray-log-support branch February 16, 2017 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants