Skip to content

Commit

Permalink
fix(processMatch): remove // from regex
Browse files Browse the repository at this point in the history
Without this change, the regex for several recipes are wrapped in slashes.  The
strings are taken directly as a regex, and don't need the slashes.  Here we
remove those slashes to avoid trying to incorrectly match the processes.
  • Loading branch information
zlesnr committed Feb 26, 2021
1 parent e4c2137 commit 0a70b1b
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 27 deletions.
2 changes: 1 addition & 1 deletion examples/sample-linux-infrastructure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ keywords:
- Linux2

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}%' FACET entityGuid SINCE 10 minutes ago"

Expand Down
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/go/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- go

processMatch:
- /go/
- go

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/go/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- go

processMatch:
- /go/
- go

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/java/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- java

processMatch:
- /java/
- java

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/java/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- java

processMatch:
- /java/
- java

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/php/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- php

processMatch:
- /php/
- php

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/python/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- python

processMatch:
- /python/
- python

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/python/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- python

processMatch:
- /python/
- python

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/ruby/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- ruby

processMatch:
- /ruby/
- ruby

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
4 changes: 2 additions & 2 deletions recipes/newrelic/apm/ruby/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- ruby

processMatch:
- /ruby/
- ruby

install:

Expand All @@ -25,4 +25,4 @@ install:
default:
cmds:
- |
echo ""
echo ""
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/amazonlinux2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ keywords:
- Linux2

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}%' FACET entityGuid SINCE 10 minutes ago"

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/centos_rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ keywords:
- RHEL 8

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}%' FACET entityGuid SINCE 10 minutes ago"

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ keywords:
- Buster

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' FACET entityGuid SINCE 10 minutes ago"

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/logs/logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ keywords:
- Logs

processMatch:
- /logs/
- logs

validationNrql: "SELECT count(*) from Log where hostname like '{{.HOSTNAME}}%' FACET entity.guids SINCE 10 minutes ago"

Expand Down
3 changes: 1 addition & 2 deletions recipes/newrelic/infrastructure/ohi/flex/flex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ installTargets:
keywords:
- Flex

processMatch:
- /logs/
processMatch: []

install:
version: "3"
Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/suse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ keywords:
- SLES

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' FACET entityGuid SINCE 10 minutes ago"

Expand Down
2 changes: 1 addition & 1 deletion recipes/newrelic/infrastructure/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ keywords:
- Focal

processMatch:
- /infra/
- infra

validationNrql: "SELECT count(*) from SystemSample where hostname like '{{.HOSTNAME}}' FACET entityGuid SINCE 10 minutes ago"

Expand Down

0 comments on commit 0a70b1b

Please sign in to comment.