Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
arthur-zzz
noc
Commits
f15b95ec
Commit
f15b95ec
authored
Jun 23, 2021
by
Andrey Vertiprahov
Browse files
Merge branch 'clean-black' into 'master'
Fix flake. See merge request
noc/noc!5478
parents
8ba1686e
69d00127
Pipeline
#32288
failed with stages
in 60 minutes and 2 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
core/cdag/node/metrics.py
View file @
f15b95ec
...
...
@@ -14,7 +14,6 @@ from pydantic import BaseModel
# NOC modules
from
noc.core.service.loader
import
get_service
from
..typing
import
ValueType
from
.base
import
BaseCDAGNode
,
ValueType
,
Category
...
...
sa/profiles/Eltex/LTE/get_arp.py
View file @
f15b95ec
...
...
@@ -22,7 +22,8 @@ class Script(BaseScript):
r
"^\s*\d+\s+port\s+(?P<interface>\d+)\s+"
r
"(?P<mac>\S+)\s+(?P<ip>\d+\S+)"
,
re
.
MULTILINE
)
rx_line2
=
re
.
compile
(
r
"^\s*(?P<vlan>\d+)\s+(?P<ip>\d+\S+)\s+(?P<mac>\S+)\s+(?P<interface>\S+\s\d+)\s+"
,
re
.
MULTILINE
r
"^\s*(?P<vlan>\d+)\s+(?P<ip>\d+\S+)\s+(?P<mac>\S+)\s+(?P<interface>\S+\s\d+)\s+"
,
re
.
MULTILINE
,
)
def
execute
(
self
):
...
...
services/metrics/service.py
View file @
f15b95ec
...
...
@@ -105,7 +105,7 @@ class MetricsService(FastAPIService):
labels
=
data
.
get
(
"labels"
)
if
not
labels
or
not
si
.
key_labels
:
return
scopes
=
{
f
'
{
l
.
rsplit
(
"
::
", 1)[0]
}
::'
:
l
for
l
in
labels
}
scopes
=
{
f
'
{
l
l
.
rsplit
(
"
::
", 1)[0]
}
::'
:
l
l
for
l
l
in
labels
}
for
k
in
si
.
key_labels
:
v
=
scopes
.
get
(
k
)
if
v
is
not
None
:
...
...
services/mib/api/mib.py
View file @
f15b95ec
...
...
@@ -12,10 +12,6 @@ import subprocess
import
re
from
importlib.machinery
import
SourceFileLoader
import
datetime
from
shutil
import
which
# Third-party modules
from
typing
import
Optional
,
List
# NOC modules
from
noc.config
import
config
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment