diff --git a/kubernetes/cmsweb/monitoring/logstash.conf b/kubernetes/cmsweb/monitoring/logstash.conf
index 615e6f5eb..d7d4a5ade 100644
--- a/kubernetes/cmsweb/monitoring/logstash.conf
+++ b/kubernetes/cmsweb/monitoring/logstash.conf
@@ -23,15 +23,34 @@ filter {
         pattern_definitions => { "WORDHYPHEN" => "\b[\w\-]+\b" }
         match => { "request" => '/%{WORDHYPHEN:system}%{UNIXPATH:uri_path}%{URIPARAM:uri_params}?' }
       }
-      if [uri_params] {
-          grok { match => { "uri_path" => '/.*/%{DATA:api}$' } }
-          if [api] == "" {
-              grok { match => { "uri_path" => '/.*/%{DATA:api}/$' } }
+      if [system] =~ /^(wmstatsserver|reqmgr2|t0_reqmon|ms-pileup|ms-transferor|ms-monitor|ms-output|ms-unmerged|ms-rulecleaner)$/ {
+          grok {
+              match => { "uri_path" => '/[^/]+/%{WORD:api}' }
           }
-      } else {
-          grok { match => { "request" => '/.*/%{DATA:api}$' } }
           if [api] == "" {
-              grok { match => { "request" => '/.*/%{DATA:api}/$' } }
+              grok {
+                  match => { "uri_path" => '/[^/]+/%{DATA:api}/' }
+              }
+          }
+      }else {
+          if [uri_params] {
+              grok {
+                  match => { "uri_path" => '/.*/%{DATA:api}$' }
+              }
+              if [api] == "" {
+                  grok {
+                      match => { "uri_path" => '/.*/%{DATA:api}/$' }
+                  }
+              }
+          } else {
+              grok {
+                  match => { "request" => '/.*/%{DATA:api}$' }
+              }
+              if [api] == "" {
+                  grok {
+                      match => { "request" => '/.*/%{DATA:api}/$' }
+                  }
+              }
           }
       }
       if [uri_params] and ![api] {