public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename newsblur_data_request to newsblur for netdata charts and add a few more charts. WIP

Browse source
This commit is contained in:
Jonathan Math 2021-04-06 17:47:30 -05:00
parent 2b25b5bf1c
commit 479ec483f1
7 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ansible/roles/netdata/tasks/main.yml
View file

@ -42,9 +42,9 @@
- /srv/newsblur/docker/netdata/netdatalib:/var/lib/netdata
- /srv/newsblur/docker/netdata/netdatacache:/var/cache/netdata
- /srv/newsblur/docker/netdata/netdata.conf:/etc/netdata/netdata.conf
- /srv/newsblur/docker/netdata/netdataconfig/python.d/newsblur_data_request.py:/usr/libexec/netdata/python.d/newsblur_data_request.chart.py
- /srv/newsblur/docker/netdata/netdataconfig/python.d/newsblur.py:/usr/libexec/netdata/python.d/newsblur.chart.py
- /srv/newsblur/docker/netdata/netdataconfig/python.d.conf:/usr/lib/netdata/conf.d/python.d.conf
- /srv/newsblur/docker/netdata/netdataconfig/python.d/newsblur_data_request.conf:/usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf
- /srv/newsblur/docker/netdata/netdataconfig/python.d/newsblur.conf:/usr/lib/netdata/conf.d/python.d/newsblur.conf
- /srv/newsblur/utils/netdata/config/go.d.conf:/usr/lib/netdata/conf.d/go.d.conf
- /etc/passwd:/host/etc/passwd:ro

4
docker-compose.yml
View file

@ -173,8 +173,8 @@ services:
- ./docker/netdata/netdatalib:/var/lib/netdata
- ./docker/netdata/netdatacache:/var/cache/netdata
- ./docker/netdata/netdataconfig/netdata.conf:/etc/netdata/netdata.conf
- ./docker/netdata/netdataconfig/python.d/newsblur_data_request.py:/usr/libexec/netdata/python.d/newsblur_data_request.chart.py
- ./docker/netdata/netdataconfig/python.d/newsblur.py:/usr/libexec/netdata/python.d/newsblur.chart.py
- ./docker/netdata/netdataconfig/python.d.conf:/usr/lib/netdata/conf.d/python.d.conf
- ./docker/netdata/netdataconfig/python.d/newsblur_data_request.conf:/usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf
- ./docker/netdata/netdataconfig/python.d/newsblur.conf:/usr/lib/netdata/conf.d/python.d/newsblur.conf
- ./utils/netdata/config/go.d.conf:/usr/lib/netdata/conf.d/go.d.conf
- /etc/passwd:/host/etc/passwd:ro

24
docker/netdata/netdataconfig/netdata.conf
View file

@ -553,7 +553,7 @@
# space usage = no
# inodes usage = no
[plugin:proc:diskspace:/usr/libexec/netdata/python.d/newsblur_data_request.chart.py]
[plugin:proc:diskspace:/usr/libexec/netdata/python.d/newsblur.chart.py]
# space usage = no
# inodes usage = no
@ -561,7 +561,7 @@
# space usage = no
# inodes usage = no
[plugin:proc:diskspace:/usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf]
[plugin:proc:diskspace:/usr/lib/netdata/conf.d/python.d/newsblur.conf]
# space usage = auto
# inodes usage = auto
@ -2867,18 +2867,18 @@
# dim reserved_for_root multiplier = 1
# dim reserved_for_root divisor = 1
[disk_space._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf]
[disk_space._usr_lib_netdata_conf.d_python.d_newsblur.conf]
# history = 5
# enabled = yes
# cache directory = /var/cache/netdata/disk_space._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf
# cache directory = /var/cache/netdata/disk_space._usr_lib_netdata_conf.d_python.d_newsblur.conf
# chart type = stacked
# type = disk_space
# family = /usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf
# family = /usr/lib/netdata/conf.d/python.d/newsblur.conf
# units = GiB
# context = disk.space
# priority = 2023
# name = disk_space._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf
# title = Disk Space Usage for /usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf [grpcfuse]
# name = disk_space._usr_lib_netdata_conf.d_python.d_newsblur.conf
# title = Disk Space Usage for /usr/lib/netdata/conf.d/python.d/newsblur.conf [grpcfuse]
# dim avail name = avail
# dim avail algorithm = absolute
# dim avail multiplier = 4096
@ -2892,18 +2892,18 @@
# dim reserved_for_root multiplier = 4096
# dim reserved_for_root divisor = 1073741824
[disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf]
[disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur.conf]
# history = 5
# enabled = yes
# cache directory = /var/cache/netdata/disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf
# cache directory = /var/cache/netdata/disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur.conf
# chart type = stacked
# type = disk_inodes
# family = /usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf
# family = /usr/lib/netdata/conf.d/python.d/newsblur.conf
# units = inodes
# context = disk.inodes
# priority = 2024
# name = disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur_data_request.conf
# title = Disk Files (inodes) Usage for /usr/lib/netdata/conf.d/python.d/newsblur_data_request.conf [grpcfuse]
# name = disk_inodes._usr_lib_netdata_conf.d_python.d_newsblur.conf
# title = Disk Files (inodes) Usage for /usr/lib/netdata/conf.d/python.d/newsblur.conf [grpcfuse]
# dim avail name = avail
# dim avail algorithm = absolute
# dim avail multiplier = 1

2
docker/netdata/netdataconfig/python.d.conf
View file

@ -45,7 +45,7 @@ chrony: no
# dovecot: yes
# elasticsearch: yes
# energid: yes
newsblur_data_request: yes
newsblur: yes
# this is just an example
example: no

2
docker/netdata/netdataconfig/python.d/newsblur_data_request.conf → docker/netdata/netdataconfig/python.d/newsblur.conf
View file

@ -68,7 +68,7 @@
# ----------------------------------------------------------------------
# AUTO-DETECTION JOBS
newsblur_data_request:
newsblur:
name: "NewsBlur Data" # the JOB's name as it will appear on the dashboard
update_every: 1 # the JOB's data collection frequency
priority: 60000 # the JOB's order on the dashboard

0
docker/netdata/netdataconfig/python.d/newsblur_data_request.old.py → docker/netdata/netdataconfig/python.d/newsblur.old.py
View file

29
docker/netdata/netdataconfig/python.d/newsblur_data_request.py → docker/netdata/netdataconfig/python.d/newsblur.py
View file

@ -1,32 +1,32 @@
# -*- coding: utf-8 -*-
# Description: example netdata python.d module
# Author: Put your name here (your github login)
# SPDX-License-Identifier: GPL-3.0-or-later
from random import SystemRandom
from bases.FrameworkServices.SimpleService import SimpleService
priority = 90000
ORDER = [
'app-servers',
'feed-counts'
'app-times',
'classifiers'
]
CHARTS = {
'app-servers': {
# 'options': [name, title, units, family, context, charttype]
'options': [None, 'App Servers', 'Total', 'family', 'context', 'stacked'], # line indicates that it is a line graph
'options': [None, 'App Server Page Loads', None, None, 'context', 'stacked'], # line indicates that it is a line graph
'lines': [
['app servers total'] #must be a valid key in 'get_data()'s return
]
},
'feed-counts': {
# 'options': [name, title, units, family, context, charttype]
'options': [None, 'Feed Counts', 'Total', 'family', 'context', 'line'], # line indicates that it is a line graph
'app-times': {
'options': [None, 'NewsBlur App Times', None, None, 'context', 'stacked'], # line indicates that it is a line graph
'lines': [
['feed counts total'] #must be a valid key in 'get_data()'s return
['app times total']
]
},
'classifiers': {
'options': [None, 'Classifiers', None, None, 'context', 'stacked'], # line indicates that it is a line graph
'lines': [
['classifiers feeds']
]
}
}
@ -48,12 +48,11 @@ class Service(SimpleService):
def get_data(self):
data = dict()
charts = {
"app-servers": "app servers total",
"feed-counts": "feed counts total"
"app-times": "app times total",
"classifiers": "classifiers feeds"
}
for chart, dimension_id in charts.items():