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.

Sign up for GitHub

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

Jump to bottom

Monitor metrics alerts: Support custom namespace. Add guidance for using ANTLR code-gen. #10108

Merged
merged 3 commits into from
Aug 5, 2019
+151 −81
Merged

Monitor metrics alerts: Support custom namespace. Add guidance for using ANTLR code-gen. #10108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d81fdf7
Fix #9460. Add guidance for using ANTLR code-gen.
tjprescott Jul 31, 2019
440565a
Code review feedback.
tjprescott Jul 31, 2019
7c32f71
Code review feedback.
tjprescott Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/azure-cli/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ Release History
* Fixed issue where `az functionapp create` does not accept Standard_RAGRS storage account type.
* Fixed an issue where az webapp up would fail if run using older versions of python

**Monitor**

* `metrics alert create`: Allow '/' and '.' characters in namespace name to support custom metrics.

**Network**

* network nic ip-config add: Fixes #9861 where --ids was inadvertently exposed but did not work.
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/monitor/grammar/MetricAlertCondition.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ expression : aggregation (namespace '.')* (QUOTE metric QUOTE WHITESPAC

aggregation : WORD WHITESPACE ;

namespace : WORD ;
namespace : (WORD | '/' | '.')+;

metric : (WORD | WHITESPACE | '.' | '/' | '_' | '\\' | ':' | '%')+;

Expand Down
5 changes: 3 additions & 2 deletions src/azure-cli/azure/cli/command_modules/monitor/grammar/MetricAlertConditionLexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

# pylint: disable=all

# Generated from MetricAlertCondition.g4 by ANTLR 4.7.1
# Generated from MetricAlertCondition.g4 by ANTLR 4.7.2
# encoding: utf-8
from __future__ import print_function
from antlr4 import *
from io import StringIO
import sys



def serializedATN():
with StringIO() as buf:
buf.write(u"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2")
Expand Down Expand Up @@ -154,7 +155,7 @@ class MetricAlertConditionLexer(Lexer):

def __init__(self, input=None, output=sys.stdout):
super(MetricAlertConditionLexer, self).__init__(input, output=output)
self.checkVersion("4.7.1")
self.checkVersion("4.7.2")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/monitor/grammar/MetricAlertConditionListener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# pylint: disable=all

# Generated from MetricAlertCondition.g4 by ANTLR 4.7.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we probably still need the license head

# Generated from MetricAlertCondition.g4 by ANTLR 4.7.2
from antlr4 import *

# This class defines a complete listener for a parse tree produced by MetricAlertConditionParser.
Expand Down
Loading