Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ivan Tyagov
slapos
Commits
0a17118a
Commit
0a17118a
authored
Nov 20, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
grafana: fix activities, http_response and influxdb logs
See merge request
nexedi/slapos!1693
parents
5cc35a9d
0cf057f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
software/grafana/buildout.hash.cfg
software/grafana/buildout.hash.cfg
+2
-2
software/grafana/instance-agent.cfg.in
software/grafana/instance-agent.cfg.in
+7
-6
software/grafana/instance-default.cfg.in
software/grafana/instance-default.cfg.in
+2
-2
No files found.
software/grafana/buildout.hash.cfg
View file @
0a17118a
...
...
@@ -19,11 +19,11 @@ md5sum = 32c772c593d2c3c38c26186b91b78cf8
[instance-default]
filename = instance-default.cfg.in
md5sum =
b4330fbe0c9c3631f4f477c06d3460b3
md5sum =
86e379ac6ba789d65369ca1e0d4dfa3f
[instance-agent]
filename = instance-agent.cfg.in
md5sum =
9fc368a3ac16bee297a4f2ad87b3bbb4
md5sum =
89fd1b010351cea9968360054e0c4aa9
[influxdb-config-file]
...
...
software/grafana/instance-agent.cfg.in
View file @
0a17118a
...
...
@@ -214,13 +214,13 @@ init =
},
{
"query": """
select 'message' as cmf_activity_queue, count(*) as failed_message_count
from message where processing_node between -
2 and -10
union all select 'message_queue' as cmf_activity_queue, count(*) as failed_message_count
from message_queue where processing_node between -
2 and -10
select 'message' as cmf_activity_queue,
method_id,
count(*) as failed_message_count
from message where processing_node between -
10 and -2 group by method_id
union all select 'message_queue' as cmf_activity_queue,
method_id,
count(*) as failed_message_count
from message_queue where processing_node between -
10 and -2 group by method_id
""",
"field_columns_include": ["failed_message_count"],
"tag_columns_include": ["cmf_activity_queue"],
"tag_columns_include": ["cmf_activity_queue"
, "method_id"
],
},
# TODO: these queries are slow and maybe not correct
# {
...
...
@@ -263,7 +263,8 @@ init =
urls = application.get("urls", [])
if urls:
inputs["http_response"].append({
"interval": "5m",
"interval": "2m",
"response_timeout": "1m",
"urls": urls,
"tags": {"app": application["name"]},
})
...
...
software/grafana/instance-default.cfg.in
View file @
0a17118a
...
...
@@ -637,7 +637,7 @@ init =
"type": "system",
"partitions": [
{
"name": "
grafana
",
"name": "
influxdb
",
"static-tags": {
"partition_reference": slap_connection['partition-id'],
},
...
...
@@ -646,7 +646,7 @@ init =
]
},
{
"name": "
influxdb
",
"name": "
grafana
",
"static-tags": {
"partition_reference": slap_connection['partition-id'],
},
...
...
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