Skip to content

Commit

Permalink
Merge pull request #218 from observIQ/openshift-regex_parser-pod-name
Browse files Browse the repository at this point in the history
Fix service name and pod name parsing
  • Loading branch information
Joseph Sirianni authored Feb 4, 2021
2 parents 7cdf2b4 + 7f03a50 commit f6eeed2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.0.43] - Unreleased
## [0.0.44] - Unreleased
## [0.0.43] - 2021-02-04
- Update `openshift` plugin ([PR218](https://github.com/observIQ/stanza-plugins/pull/218))
- Fix regex_parser to handle periods in pod name
- Fix regex_parser: remove `k8s_` prefix from service name
### Changed
## [0.0.42] - 2021-02-03
### Changed
Expand Down Expand Up @@ -132,7 +136,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add metadata to add log_type `observiq.agent.logagent`
## [0.0.35] - 2021-01-11
### Changed
- Update `nginx_ingress` plugin
- Update `nginx_ingress` plugin
- Update observiq log format to be JSON format ([PR173](https://github.com/observIQ/stanza-plugins/pull/173))
- Update error and access `log_type` values to `nginx.ingress.error` and `nginx.ingress.access` ([PR166](https://github.com/observIQ/stanza-plugins/pull/166))
- Update `pgbouncer` plugin ([PR172](https://github.com/observIQ/stanza-plugins/pull/172))
Expand Down Expand Up @@ -160,7 +164,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update `kubernetes_events` plugin ([PR162](https://github.com/observIQ/stanza-plugins/pull/162))
- Add missing INFO level cluster events
- Update `dockerswarm` plugin ([PR161](https://github.com/observIQ/stanza-plugins/pull/161))
- Update docker_swarm_parser parser timestamp layout to use space padded day.
- Update docker_swarm_parser parser timestamp layout to use space padded day.
- Remove the severity `preserve_to` parameter from dockerd_parser and containerd_parser
- Change severity name on containerd_parser to containerd_severity
- Add pid field
Expand Down
4 changes: 2 additions & 2 deletions plugins/openshift.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
version: 0.0.6
version: 0.0.7
title: Openshift
description: Log parser for Openshift
supported_platforms:
Expand Down Expand Up @@ -77,7 +77,7 @@ pipeline:

# Parse the container name into service name, pod name, and namespace
- type: regex_parser
regex: '^(?P<service_name>[-a-z0-9_]+)_(?P<pod_name>[-a-z0-9]+)_(?P<namespace>[-a-z0-9]+)_[-a-z0-9]+_\d+$'
regex: '^k8s_(?P<service_name>[-a-z0-9_]+)_(?P<pod_name>[-a-z0-9\.]+)_(?P<namespace>[-a-z0-9]+)_[-a-z0-9]+_\d+$'
parse_from: CONTAINER_NAME
parse_to: k8s_metadata

Expand Down

0 comments on commit f6eeed2

Please sign in to comment.