Commit Graph

75 Commits

Author SHA1 Message Date
nico 044e0334d2
flake8 fixup
* fix trailing/ leading whitespaces
* fix None comparison to use is
+ add noqa ignore statements for the influx escape replacements
+ add noqa ignore statements around the bare excepts

TODO: This is only a temporary fix for most of the bare excepts, we need further specify those.
2020-06-29 18:59:16 +02:00
nico 5f0cb289c1
black reformat
* black reformatted the code
2020-06-29 11:03:49 +02:00
nico a8b78be75d
black flake8 compatability
+ add E203 whitespace before ‘:’ to flake8 ignore

Due to black's formatting we need to ignore flake8 warning.
2020-06-29 01:30:33 +02:00
nico 8b26b1eb8e
tool configuration
* seperate tool config and tool call
* rename black stage to code consistency for a greater readability
- remove allow_failure from the third stage

I did decide to remove the allowed failure tag to encourage a higher code quality.
2020-06-27 12:07:09 +02:00
nico fa87c166ed
finalizing the ci pipelines
- revert 565702d9 as it did not behave like it should have
+ add black pipeline for code consistency
2020-06-27 00:56:38 +02:00
nico 565702d91f
gitlab ci syntax
* multiple before_script segments overwrite one another
2020-06-27 00:40:18 +02:00
nico 453d054ebb
gitlab ci caching
+ add pip caching
+ add venv caching
2020-06-27 00:33:10 +02:00
nico e503508b5b
split up flake jobs
* split flake8 jobs into two seperate jobs to better control the result
+ add allow_failure: true to the pep8 job to not discourage anybody from commiting code
2020-06-26 23:31:15 +02:00
nico 2f730bf186
flake8 gitlab ajustments
* ajust ci config for gitlabs ci
* reduced max line length to 120

It seems gitlab prefers it that way

+ add some comments
2020-06-26 23:05:21 +02:00
nico 78de6199ce
initial ci runner config
* have mercy on my soul
2020-06-26 19:08:22 +02:00
genofire 1256ea7de8 add new metrics to prometheus 2020-06-26 08:25:10 +02:00
genofire 76b6be03ab add call for nodename 2020-06-26 08:24:45 +02:00
nico bbf156057f
add new values to influx
+ add uptime and process values to influx exporter
2020-06-26 01:00:39 +02:00
nico 907d3bdb61
properly implement more values
* fix the bad job with commit bf05b826
+ proper guidance methods complete with a proper name
2020-06-26 00:58:06 +02:00
nico 7296375924
pep8 and import ajustments
* optimzed import statements
* pep8 alignment changes, mostly missing whitespaces, newlines or redundant brackets
2020-06-26 00:55:49 +02:00
nico 86562276d4
fix get_nodes not being a public method
* fix get_nodes being a public method
2020-06-25 00:45:21 +02:00
nico bf05b826a1
add more global values
* organize global values
+ add global uptime value
+ add global processes count value
2020-06-25 00:20:47 +02:00
genofire 87dc79a2f7 Inherits control in metrics (+ fix nameing to _count)
See merge request sum7/ejabberd-tools!5
2020-06-24 11:31:40 +02:00
nico 71440b7a8f
pep8 and friends
* add default logging NullHandler
* fix indentation mismatch
* rename control to calls to better point out its purpose
* rename class to EjabberdApiCalls to better point out it purpose
* changed get_nodes to an internal support method
2020-06-17 15:47:31 +02:00
nico d36dbe03c8
Revert "add more global values"
This reverts commit 990d3abdc6.

my mistake, I hadn't checked if I am on the correct branch
2020-06-17 13:30:08 +02:00
nico 990d3abdc6
add more global values
+ add global uptime value
+ add global processes count value
2020-06-17 00:41:59 +02:00
genofire c7bf9f6b9f fix muc_host 2020-06-10 23:23:34 +02:00
nico ede665016b
clarify documentation
* align url parameter to the ejabberd example
* update virtualenv command
* remove influxdb service requirement from service template
2020-06-10 21:40:01 +02:00
nico 4f53572c7e
debugging by default
* disable debug logs by default in the config template
2020-06-10 20:19:33 +02:00
genofire dd30520c62 improve control.py 2020-06-10 12:50:35 +02:00
genofire 6bb4308de2 metrics: use inherits of control/api 2020-06-10 12:50:35 +02:00
nico bfa47d1ae0
syntax and pep8
what have I become - a pep8 monster
2020-06-10 12:40:19 +02:00
genofire b8de1646c5 systemd: prometheus does not needed on same machine then the exporter 2020-06-10 12:17:09 +02:00
genofire d5304e67eb prometheus: fix client by ip 2020-06-10 12:12:46 +02:00
nico a6d1ae443e
systemd service hardening
+ add systemd protective features to restrict the system access
+ add service documentation link
+ add service required / after fields
2020-06-10 12:00:12 +02:00
nico 6c08f4bb64
no unicorns
gunicorn VIRTUAL_ENV detection is not compatible to our tools
2020-06-10 10:40:48 +02:00
genofire f14c9af6ee systemd: add support for venv and cleanup 2020-06-10 07:35:45 +02:00
genofire 3b451600cf systemd: prometheus files with venv 2020-06-10 07:28:10 +02:00
genofire 38a7b17180 add cleanup.py 2020-06-10 07:24:35 +02:00
nico 893f68497d
further documentation
+ add systemd service documentation
2020-06-10 00:56:43 +02:00
nico 331adaf820
fixup
* update version regex to succesfully match only the version string
+ add missing import
2020-06-10 00:40:22 +02:00
genofire 7ca08b12c0 fix ipv6 support for prometheus 2020-06-09 20:56:01 +02:00
genofire 710e139403 add logging to influxdb 2020-06-09 20:22:30 +02:00
genofire 6029cdc831 fix prometheus 2020-06-09 20:22:20 +02:00
genofire 52dc918125 fix versionstring parsing 2020-06-09 20:19:30 +02:00
genofire 8df15a5595 update clients naming 2020-06-09 20:18:48 +02:00
genofire 3bcc8ab25a refactory prometheus exporter - use python lib 2020-06-09 20:18:48 +02:00
nico 692d1df2c1
initial documentation attempt
+ add install and configuration documentations
2020-06-09 19:19:12 +02:00
nico 5cf6889799
fix version string being unpopulated
* fix version string being empty
+ add error code 17 to the README
resolves #2

Error Code 17 means one of two things
a) the configured user credentials are not correct, therefore the user is not able to properly login
b) the configured user does not have the correct permissions to interact with the api
2020-06-09 17:55:00 +02:00
nico 0e0f9565c2
Client ressource addition
* update Xabber ressource names
+ add Monal ressource
2020-05-09 14:52:27 +02:00
nico d44e4021fe
code cleanup
* split up api and metrics class
* revamped file nameming to better resemble their function
* update prometheus and influx files

* fixed version regex to not break on - in version string
2020-04-28 14:11:49 +02:00
nico bfcb912595
update requirements file
+ add ruamel.yaml to requierments file
2020-04-09 14:10:44 +02:00
nico 634ba02e76
config handeling
* add proper configuration handeling to the metrics class
2020-04-08 13:27:52 +02:00
Martin/Geno 1a3782ce97 Merge branch 'yaml' into 'master'
yaml config

See merge request sum7/ejabberd-metrics!4
2020-03-07 11:06:17 +01:00
nico d827444889
yaml config
+ implement yaml config file parsing
* update default config file
* update global config file from .conf to .yml ( debatable )

Signed-off-by: nico <nico@magicbroccoli.de>
2020-03-06 12:46:48 +01:00