public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-04-13 09:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix template and views for monitor to be better suited for dynamic data in promql

Browse source
This commit is contained in:
Jonathan Math 2021-05-03 09:27:28 -05:00
parent 6f8f2efc9b
commit abb6627ae2
16 changed files with 70 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/monitor/views/newsblur_app_servers.py
View file

@ -11,8 +11,12 @@ class AppServers(View):
data['total'] = self.total[0]['feeds']
chart_name = "app_servers"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{app_server="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

8
apps/monitor/views/newsblur_app_times.py
View file

@ -11,12 +11,16 @@ class AppTimes(View):
chart_name = "app_times"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{app_server="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}
return render(request, 'monitor/prometheus_data.html', context, content_type="text/plain")
return render(request, 'monitor/prometheus_dynamic_data.html', context, content_type="text/plain")
@property
def stats(self):

5
apps/monitor/views/newsblur_classifiers.py
View file

@ -16,8 +16,11 @@ class Classifiers(View):
chart_name = "classifiers"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{classifier="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

6
apps/monitor/views/newsblur_dbtimes.py
View file

@ -18,9 +18,11 @@ class DbTimes(View):
}
chart_name = "db_times"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{db="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

7
apps/monitor/views/newsblur_errors.py
View file

@ -12,9 +12,12 @@ class Errors(View):
}
chart_name = "errors"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'feed_success {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

6
apps/monitor/views/newsblur_feed_counts.py
View file

@ -48,8 +48,12 @@ class FeedCounts(View):
chart_name = "feed_counts"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

7
apps/monitor/views/newsblur_feeds.py
View file

@ -28,9 +28,12 @@ class Feeds(View):
}
chart_name = "feeds"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

6
apps/monitor/views/newsblur_loadtimes.py
View file

@ -13,8 +13,12 @@ class LoadTimes(View):
chart_name = "load_times"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_stories.py
View file

@ -13,8 +13,11 @@ class Stories(View):
chart_name = "stories"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_tasks_codes.py
View file

@ -9,9 +9,12 @@ class TasksCodes(View):
data = dict((("_%s" % s['_id'], s['feeds']) for s in self.stats))
chart_name = "task_codes"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_tasks_pipeline.py
View file

@ -11,8 +11,11 @@ class TasksPipeline(View):
chart_name = "task_pipeline"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_tasks_servers.py
View file

@ -13,8 +13,11 @@ class TasksServers(View):
chart_name = "task_servers"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{server="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_tasks_times.py
View file

@ -11,8 +11,11 @@ class TasksTimes(View):
chart_name = "task_times"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

7
apps/monitor/views/newsblur_updates.py
View file

@ -22,9 +22,12 @@ class Updates(View):
}
chart_name = "updates"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

5
apps/monitor/views/newsblur_users.py
View file

@ -22,8 +22,11 @@ class Users(View):
chart_name = "users"
chart_type = "counter"
formatted_data = {}
for k, v in data.items():
formatted_data[k] = f'{chart_name}{{category="{k}"}} {v}'
context = {
"data": data,
"data": formatted_data,
"chart_name": chart_name,
"chart_type": chart_type,
}

4
templates/monitor/prometheus_data.html
View file

@ -1,4 +1,4 @@
# TYPE {{chart_name}} {{chart_type}}
{% for k, v in data.items %}
# TYPE {{chart_name}}_{{k}} {{chart_type}}
{{chart_name}}_{{k}} {{ v }}
{{ v |safe }}
{% endfor %}