Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
16519729
Commit
16519729
authored
Sep 12, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! grafana split
parent
f06b7517
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
software/grafana/buildout.hash.cfg
software/grafana/buildout.hash.cfg
+1
-1
software/grafana/instance-agent.cfg.in
software/grafana/instance-agent.cfg.in
+8
-8
No files found.
software/grafana/buildout.hash.cfg
View file @
16519729
...
@@ -23,7 +23,7 @@ md5sum = 5a9650b8654b2aeaeab076b08b248b70
...
@@ -23,7 +23,7 @@ md5sum = 5a9650b8654b2aeaeab076b08b248b70
[instance-agent]
[instance-agent]
filename = instance-agent.cfg.in
filename = instance-agent.cfg.in
md5sum = e
db4eeb900ad13a3b3a6e174c1ea533b
md5sum = e
5a3fe8a90fdbe408384f21a8a2da744
[influxdb-config-file]
[influxdb-config-file]
...
...
software/grafana/instance-agent.cfg.in
View file @
16519729
...
@@ -255,7 +255,7 @@ init =
...
@@ -255,7 +255,7 @@ init =
'%{IPORHOST:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \\[%{HTTPDATE:timestamp}\\] "(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-) %{QS:referrer} %{QS:agent} %{NUMBER:response_time:int}'
'%{IPORHOST:client_ip} %{NOTSPACE:ident} %{NOTSPACE:auth} \\[%{HTTPDATE:timestamp}\\] "(?:%{WORD:verb:tag} %{NOTSPACE:request}(?: HTTP/%{NUMBER:http_version:float})?|%{DATA})" %{NUMBER:resp_code:tag} (?:%{NUMBER:resp_bytes:int}|-) %{QS:referrer} %{QS:agent} %{NUMBER:response_time:int}'
],
],
"grok_timezone": "Local",
"grok_timezone": "Local",
"name_override": "haproxy
_logs"
"name_override": "haproxy
-logs",
"tags": dict(
"tags": dict(
partition.get("static-tags", {}),
partition.get("static-tags", {}),
app=application["name"],
app=application["name"],
...
@@ -308,13 +308,13 @@ init =
...
@@ -308,13 +308,13 @@ init =
access_path_dict[f"{application['instance-root']}/sv.sock"] = 'rw'
access_path_dict[f"{application['instance-root']}/sv.sock"] = 'rw'
telegraf_slapos_input_command = self.options['telegraf-input-slapos-bin']
telegraf_slapos_input_command = self.options['telegraf-input-slapos-bin']
inputs["execd"].append({
inputs["execd"].append({
"name_override": "slapos
_
services",
"name_override": "slapos
-
services",
"command": [telegraf_slapos_input_command, '-config', telegraf_slapos_input_config_file],
"command": [telegraf_slapos_input_command, '-config', telegraf_slapos_input_config_file],
"tags": {"app": application["name"]},
"tags": {"app": application["name"]},
})
})
# drop measurements for not monitored partitions.
# drop measurements for not monitored partitions.
processors["starlark"].append({
processors["starlark"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 1,
"order": 1,
"source": f'''
"source": f'''
def apply(metric):
def apply(metric):
...
@@ -327,7 +327,7 @@ init =
...
@@ -327,7 +327,7 @@ init =
# context and because we use the name of the partition as "name" everywhere
# context and because we use the name of the partition as "name" everywhere
# else.
# else.
processors["rename"].append({
processors["rename"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 2,
"order": 2,
"replace": [{
"replace": [{
"tag": "name",
"tag": "name",
...
@@ -335,7 +335,7 @@ init =
...
@@ -335,7 +335,7 @@ init =
}]})
}]})
# "normalize" slapos process names, remove hash from hash-files and -on-watch suffix
# "normalize" slapos process names, remove hash from hash-files and -on-watch suffix
processors["regex"].append({
processors["regex"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 3,
"order": 3,
"tags": [{
"tags": [{
"key": "process_name",
"key": "process_name",
...
@@ -343,7 +343,7 @@ init =
...
@@ -343,7 +343,7 @@ init =
"replacement": "$" + "{1}",
"replacement": "$" + "{1}",
}]})
}]})
processors["regex"].append({
processors["regex"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 4,
"order": 4,
"tags": [{
"tags": [{
"key": "process_name",
"key": "process_name",
...
@@ -353,14 +353,14 @@ init =
...
@@ -353,14 +353,14 @@ init =
}]})
}]})
# use consistent `partition_reference` for slappart
# use consistent `partition_reference` for slappart
processors["rename"].append({
processors["rename"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 5,
"order": 5,
"replace": [{
"replace": [{
"tag": "reference",
"tag": "reference",
"dest": "partition_reference",
"dest": "partition_reference",
}]})
}]})
processors["enum"].append({
processors["enum"].append({
"namepass": ["slapos
_
services"],
"namepass": ["slapos
-
services"],
"order": 6,
"order": 6,
"mapping": [{
"mapping": [{
"tag": "partition_reference",
"tag": "partition_reference",
...
...
Write
Preview
Markdown
is supported
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