diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/types.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/types.ts
index 535377a600a..49824cf5d44 100644
--- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/types.ts
@@ -12,4 +12,6 @@ export const SQLTokenTypes: TokenTypes = {
   Number: 'number.sql',
   String: 'string.sql',
   Variable: 'variable.sql',
+  Comment: 'comment.sql',
+  Regexp: 'regexp.sql',
 };
diff --git a/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.ts
index 043d607e52c..cf6cff8d0ba 100644
--- a/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.ts
@@ -24,6 +24,8 @@ export class DynamicLabelsCompletionItemProvider implements Completeable {
       Number: 'number.cloudwatch-dynamicLabels',
       String: 'string.cloudwatch-dynamicLabels',
       Variable: 'variable.cloudwatch-dynamicLabels',
+      Comment: 'comment.cloudwatch-dynamicLabels',
+      Regexp: 'regexp.cloudwatch-dynamicLabels',
     };
   }
 
diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/types.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/types.ts
index 58534242044..e8f0bfdfa3c 100644
--- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/types.ts
@@ -12,4 +12,6 @@ export const LogsTokenTypes: TokenTypes = {
   Number: 'number.cloudwatch-logs',
   String: 'string.cloudwatch-logs',
   Variable: 'variable.cloudwatch-logs',
+  Comment: 'comment.cloudwatch-logs',
+  Regexp: 'regexp.cloudwatch-logs',
 };
diff --git a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/types.ts b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/types.ts
index 7898ab036cf..a4a51cae500 100644
--- a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/types.ts
@@ -12,4 +12,6 @@ export const MetricMathTokenTypes: TokenTypes = {
   Number: 'number.cloudwatch-MetricMath',
   String: 'string.cloudwatch-MetricMath',
   Variable: 'variable.cloudwatch-MetricMath',
+  Comment: 'comment.cloudwatch-MetricMath',
+  Regexp: 'regexp.cloudwatch-MetricMath',
 };
diff --git a/public/app/plugins/datasource/cloudwatch/language/monarch/CompletionItemProvider.ts b/public/app/plugins/datasource/cloudwatch/language/monarch/CompletionItemProvider.ts
index 6d024d0179b..5d964e56664 100644
--- a/public/app/plugins/datasource/cloudwatch/language/monarch/CompletionItemProvider.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/monarch/CompletionItemProvider.ts
@@ -40,6 +40,8 @@ export class CompletionItemProvider implements Completeable {
       Number: 'number',
       String: 'string',
       Variable: 'variable',
+      Comment: 'comment',
+      Regexp: 'regexp',
     };
   }
 
diff --git a/public/app/plugins/datasource/cloudwatch/language/monarch/types.ts b/public/app/plugins/datasource/cloudwatch/language/monarch/types.ts
index c10424b78f6..ffd57ebee97 100644
--- a/public/app/plugins/datasource/cloudwatch/language/monarch/types.ts
+++ b/public/app/plugins/datasource/cloudwatch/language/monarch/types.ts
@@ -14,6 +14,8 @@ export interface TokenTypes {
   Number: string;
   String: string;
   Variable: string;
+  Comment: string;
+  Regexp: string;
 }
 
 export enum StatementPosition {