Commit Graph
100 Commits
Author SHA1 Message Date
Etienne ChampetierandGitHub caecb1d400 Merge pull request #9800 from Rixerx/openwrt-19.07
[OpenWrt 19.07] zabbix: update to 4.0.11
2019-08-22 13:56:38 -07:00
Etienne ChampetierandGitHub 9c482e23ea Merge pull request #9751 from champtar/openwrt-19.07
[19.07] prometheus-node-exporter-lua: add target & system to OpenWrt collector
2019-08-15 22:55:41 -07:00
Etienne ChampetierandEtienne Champetier f07e5b5b2c prometheus-node-exporter-lua: add target & system to OpenWrt collector
Before:
node_openwrt_info{revision="r10756+1-7546be6007",model="GL.iNet GL-AR150",id="OpenWrt",board_name="glinet,gl-ar150",release="SNAPSHOT"} 1

After:
node_openwrt_info{revision="r10756+1-7546be6007",target="ath79/generic",board_name="glinet,gl-ar150",id="OpenWrt",model="GL.iNet GL-AR150",release="SNAPSHOT",system="Atheros AR9330 rev 1"} 1

Fixes #9730, replace #9735

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit a14bed1bc9)
2019-08-15 20:22:08 -07:00
Etienne ChampetierandGitHub 39c4e21b6b Merge pull request #9731 from jefferyto/ci-improvements-openwrt-19.07
[openwrt-19.07] CI fixes and improvement
2019-08-14 11:58:49 -07:00
champtarandGitHub eb1b5cf417 Merge pull request #9504 from jefferyto/circleci-usign-openwrt-19.07
[openwrt-19.07] CircleCI: Add support for usign signatures
2019-07-18 07:52:34 -07:00
champtarandGitHub 5b73b31f9b Merge pull request #9057 from micmac1/sqlite3-pthread-arm-endian
sqlite3: libpthread change + arm endian fix
2019-05-24 08:35:59 +02:00
champtarandGitHub 211d3d1a3e Merge pull request #9024 from neheb/ath79
CircleCI: Switch to ath79 SDK
2019-05-18 10:50:41 +02:00
champtarandGitHub b30fcbb99c Merge pull request #8657 from klukonin/Prometheus_add_more_metrics
prometheus-node-exporter-lua: Add more wifi_station metrics
2019-04-28 12:42:50 -03:00
champtarandGitHub 6b8e3389a4 Merge pull request #8650 from neheb/zab2
zabbix: Specify zlib location to fix buildbots
2019-04-11 08:10:28 -07:00
champtarandGitHub 4c6345e51d Merge pull request #8540 from BKPepe/zabbix
zabbix: update to version 4.0.6
2019-04-09 09:12:07 -07:00
champtarandGitHub d8af441a95 Merge pull request #8625 from alext/wifi_station_count
prometheus-node-exporter-lua: Add wifi_station_count metric
2019-04-09 09:08:14 -07:00
champtarandGitHub ddea6e79ca Merge pull request #7813 from pm73/master
prometheus-node-exporter-lua: change network metric type to counter
2019-01-27 07:52:02 -05:00
champtarandGitHub 2a171c36fa Merge pull request #7738 from TDT-AG/pr/20181220-mwan3
mwan3: add nping to tracking method
2018-12-21 13:36:42 +01:00
champtarandGitHub 5a978f2270 Merge pull request #7734 from micmac1/master-sqlite-maint
sqlite3: change maintainer
2018-12-20 19:07:04 +01:00
champtarandGitHub cf4f87f002 Merge pull request #7725 from micmac1/master-sqlite3
(master) sqlite3 security bump
2018-12-18 22:36:01 +01:00
champtarandGitHub 49dd0fdf4d Merge pull request #7594 from dhewg/pull/prometheus-node-exporter-lua-ltq-dsl
prometheus-node-exporter-lua: add lantiq dsl modem collector
2018-12-16 21:23:20 +01:00
champtarandGitHub 655c14c5f9 Merge pull request #7542 from Rixerx/master
zabbix: update to 4.0 LTS
2018-12-16 18:59:32 +01:00
champtarandGitHub 131b83de76 Merge pull request #7523 from padre-lacroix/darkstat-master
darkstat: correction of a variable in the init script
2018-11-26 19:56:07 -05:00
champtarandGitHub eae9f8cb9e Merge pull request #7510 from darkk/fix-prometheus-zombies
prometheus-node-exporter-lua: close io.popen files to reap zombies
2018-11-25 16:54:56 -05:00
Etienne Champetier c3c3252ab5 build,circleci: add curl & wget to base image
curl was present in latest image but seems to have been remove from latest debian:9

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-24 20:46:39 -05:00
champtarandGitHub 3b13c4c5d2 Merge pull request #7466 from neheb/patch-17
sispmctl: Update to 4.1
2018-11-18 20:55:49 -05:00
champtarandGitHub 8292078466 Merge pull request #7459 from neheb/psql
sqlite3: Update to 3.53
2018-11-17 16:43:55 -05:00
champtarandGitHub a694df10d5 Merge pull request #7431 from micmac1/mari-up2
mariadb: fix build issue
2018-11-14 15:42:15 -05:00
champtarandGitHub 8376d30981 Merge pull request #7411 from micmac1/mari-up
mariadb: security bump to 10.2.19
2018-11-13 16:16:58 -05:00
champtarandGitHub 810f171cfb Merge pull request #7408 from thess/cci-url-fix
CircleCI: Fix URL references to openwrt.org
2018-11-13 11:35:27 -05:00
champtarandGitHub 3a302fc01b Merge pull request #7379 from micmac1/maria-pthread-detach
mariadb: fix pthread_detach
2018-11-10 20:39:11 -05:00
champtarandGitHub 04f96c9774 Merge pull request #7334 from neheb/monit
monit: Fix compilation without deprecated APIs
2018-11-10 20:09:40 -05:00
champtarandGitHub 332eadeb61 Merge pull request #7338 from neheb/alpine
alpine: Fix compilation without deprecated APIs on OpenSSL 1.0.2
2018-11-09 11:16:11 -05:00
champtarandGitHub 3d3d75a7ba Merge pull request #7339 from neheb/cyrus
cyrus-sasl: Fix compilation without deprecated APIs on OpenSSL
2018-11-08 11:24:25 -05:00
champtarandGitHub d36a7cf1b1 Merge pull request #7304 from ejurgensen/mxml_upgrade_212
mxml: update to 2.12
2018-11-03 21:35:17 -04:00
Etienne Champetier 7d38990928 build,circleci: fix container digest
I used podman/buildah to build this image, and the local sha256 is not the same than
the docker hub sha256. The layers are the same, so maybe just docker hub changing the manifest

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-03 08:53:48 -04:00
Etienne Champetier d6292dcd9e build,circleci: add 'time' to container build image
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-03 00:03:44 -04:00
champtarandGitHub 1ee4c1492d Merge pull request #7291 from cotequeiroz/pytz-installdev
pytz: add Package/InstallDev
2018-11-01 09:13:21 -05:00
champtarandGitHub ba581c0e8b Merge pull request #7294 from wvdakker/master
Shorewall: Bump to version 5.2.1.1
2018-11-01 09:07:51 -05:00
champtarandGitHub 52ca8c9922 Merge pull request #6927 from Rixerx/zabbix
zabbix: add server frontend
2018-10-29 20:12:16 -05:00
Etienne Champetier abf461a95a build,circleci: make BRANCH a variable
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-29 20:27:23 -04:00
Etienne Champetier e5574ea957 build,circleci: add python to docker build image
This is needed to build ca-certificates

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-29 02:07:26 -04:00
Etienne Champetier 4aeeeb65d4 build,circleci: enable CircleCI workflows
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-28 23:26:25 -04:00
Etienne Champetier c48f3f6fbd build,circleci: change exclude pattern
Even when configured to only build PR, CircleCI always build the default branch
`only: /pull.*/` seems like a good idea, but it fails when:
- you are testing on the same repo, because github doesn't create a pull branch
- when your repo is configured, because it see the push on your repo,
prevent building this commit because it doesn't match the regexp, then when you
do the PR CircleCI doesn't work
In the end what we really want is `ignore: master`

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-28 22:01:58 -04:00
Etienne Champetier cd315ec4e2 build,circleci: fixup pkgs list generation
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-28 20:18:01 -04:00
Etienne Champetier 5d1aa99648 zabbix: use ubus for zabbix-extra-network
this allow us to stop using uci /var/state,
which is deprecated since forever

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-23 19:26:38 -04:00
Etienne Champetier 2df5d52b9e zabbix: fixup zabbix-extra-wifi dependencies
we use ubus since 2014 (af1fe70acb)
we don't use uci since 2015 (76150309a8)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-23 18:59:39 -04:00
Etienne Champetier 4ebb869a94 build,circleci: make compile verbose to avoid timeout
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-23 16:40:04 -04:00
Etienne Champetier 4c1a67278f build: add CircleCI
The big advantages are:
- everyone can download the build logs and the ipks
- we use our own docker image
- people with commit access can ssh into the build env

The disadvantages:
- need to push new commits to restart the build

I haven't reimplemented the commit message checks as this should be replaced
with a separate script doing only that so we can require it
(https://help.github.com/articles/enabling-required-status-checks/)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-23 16:35:12 -04:00
Etienne Champetier 1afcc61601 zabbix: add proper ubus acl for zabbix-extra-wifi
This allow to run zabbix as non root
Thanks to Adrian Kirchner (@adriankirchner)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-23 11:14:51 -04:00
Etienne Champetier caaa7d6c9b zabbix: add PKG_CPE_ID
thanks @neheb (#6814)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-09-30 21:28:59 -04:00
champtarandGitHub a462e7e02e Merge pull request #6899 from diizzyy/patch-12
libs/sqlite: Update to 3.24.0
2018-09-23 10:07:55 -07:00
champtarandGitHub be234c29b4 Merge pull request #6803 from neheb/monit
monit: Update to 5.25.2
2018-08-19 10:55:06 -04:00
champtarandGitHub 67bc803ed9 Merge pull request #6802 from neheb/patch-30
htop: Minor adjustments
2018-08-19 10:51:11 -04:00
Etienne Champetier b584443d65 prometheus-node-exporter-lua: add conntrack collector
Also fix missing dependency of openwrt collector

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-07-25 23:23:56 +02:00
Etienne Champetier 767f87f469 prometheus-node-exporter-lua: set myself as maintainer
This was OKed sometimes ago by @simonswine
https://github.com/openwrt/packages/pull/5128

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-07-25 23:21:38 +02:00
champtarandGitHub 315d67801d Merge pull request #6165 from Rixerx/master
zabbix: Bump to latest version
2018-07-09 22:34:40 +03:00
champtarandGitHub 35690dd4ff Merge pull request #6356 from aparcar/prom-0.16
prometheus-node-exporter-lua: adapt 0.16 metrics
2018-06-29 08:48:43 +02:00
champtarandGitHub c8c1841abf Merge pull request #6306 from aparcar/fancy_release
prometheus-node-exporter-lua: handle fancy release
2018-06-21 13:28:15 +02:00
champtarandGitHub cb5ad3ed50 Merge pull request #6007 from aparcar/export-openwrt
prometheus-node-exporter-lua: add openwrt exporter
2018-05-07 07:23:24 -07:00
Etienne Champetier 4dd01ce3f7 build: move gpg keys into .keys directory
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-04-30 13:14:25 -07:00
champtarandGitHub 5800538882 Merge pull request #5894 from aparcar/prom-export
prometheus-node-exporter-lua: textfile collector
2018-04-29 12:16:03 -07:00
champtarandGitHub 68a3d3d6ee Merge pull request #5916 from aparcar/prom-bmx7v2
prometheus-node-exporter-lua: extend bmx7 plugin
2018-04-25 10:19:02 -07:00
champtarandGitHub dff805e148 Merge pull request #5963 from hnyman/htop220
htop: update to 2.2.0
2018-04-24 09:31:47 -07:00
champtarandGitHub 49df906991 Merge pull request #5854 from diizzyy/libs-sqlite
libs/sqlite: Update to 3.23.1
2018-04-12 15:20:45 -07:00
champtarandGitHub 1de97eac64 Merge pull request #5746 from hnyman/htop210
htop: update to 2.1.0
2018-03-11 11:29:55 -07:00
champtarandGitHub 8068fd5192 Merge pull request #5578 from aparcar/bmx6-exporter
prometheus-node-exporter-lua: add bmx6/7 scraper
2018-02-15 07:40:01 -08:00
champtarandGitHub 367a1c7b89 Merge pull request #5128 from champtar/prometheus
prometheus-node-exporter-lua: make it modular and faster
2018-02-01 07:58:55 -08:00
champtarandGitHub 4b918475e5 Merge pull request #5543 from dedeckeh/pr-sqlite
sqlite3: add config options to disable FTS3 and RTREE
2018-01-31 10:56:33 -08:00
champtarandGitHub 77dc2ad8e5 Merge pull request #4370 from val-kulkov/opendkim-package
opendkim: DKIM signing and verifying emails
2018-01-31 07:55:03 -08:00
champtarandGitHub 4d5c752f45 Merge pull request #5311 from mwarning/kadnode
kadnode: add new package
2018-01-22 04:37:01 +01:00
champtarandGitHub b6c6c9e535 Merge pull request #5390 from diizzyy/net-inadyn
inadyn: Update to 2.3
2018-01-21 15:05:02 +01:00
champtarandGitHub 075dc5caae Merge pull request #5387 from diizzyy/admin-netdata
admin/netdata: Update to 1.9.0
2018-01-21 14:38:07 +01:00
champtarandGitHub 7d64f2470e Merge pull request #5483 from micmac1/move-sngrep-and-sipgrep-to-telephony
Move sngrep and sipgrep to openwrt/telephony
2018-01-21 14:36:37 +01:00
champtarandGitHub a8c04c98ec Merge pull request #5482 from neheb/patch-1
btrfs-progs: Bump to 4.14.1 + add Build/InstallDev
2018-01-21 07:12:32 +01:00
champtarandGitHub 0f74fe7c13 Merge pull request #5257 from lynxis/rb_libgcrypt
libgcrypt: remove build timestamp
2018-01-20 22:33:38 +01:00
champtarandGitHub a1f960f2fa Merge pull request #5371 from MikePetullo/libsoup
libsoup: update to 2.60.2
2018-01-20 22:04:48 +01:00
champtarandGitHub eae25776a9 Merge pull request #5389 from diizzyy/libs-confuse
confuse: remove myself as maintainer
2018-01-20 21:14:56 +01:00
champtarandGitHub fac7528a60 Merge pull request #5481 from hnyman/coova
coova-chilli: remove matrixssl dependency
2018-01-20 20:29:29 +01:00
Etienne Champetier 64aa144662 build,travis: don't fail on WARNING
OpenWrt build now outputs WARNING on dependencies issues, for exemple
"WARNING: Makefile 'package/feeds/packages/coova-chilli/Makefile' has a dependency on 'libmatrixssl', which does not exist"

Relax the check for now

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-01-18 13:32:16 -08:00
champtarandGitHub ca043b097d Merge pull request #5314 from benhsmith/master
libs/libgcrypt: switch PKG_SOURCE_URL to https URI
2017-12-25 11:36:20 -08:00
champtarandGitHub 8c69bc4436 Merge pull request #5061 from mrkiko/hostside-luarocks
luarocks: Allow building luarocks for the host
2017-12-23 15:29:21 -08:00
champtarandGitHub 21b6ec97d1 Merge pull request #5276 from thess/fdk-aac
fdk-aac: Update to latest source revision. Add myself as maintainer
2017-12-13 17:13:18 -08:00
champtarandGitHub cc452ef941 Merge pull request #5261 from nxhack/bump_to_60_2
icu: update to 60.2
2017-12-13 17:12:34 -08:00
champtarandGitHub 0a7b65531e Merge pull request #5275 from thess/unrar-update
unrar: Update to latest version (5.5.8)
2017-12-13 13:39:35 -08:00
champtarandGitHub 5a58f4efd3 Merge pull request #5190 from jow-/iodine-fix-musl-endianess
iodine: properly detect endianess when building against musl libc
2017-12-13 06:57:37 -08:00
champtarandGitHub 1484eee759 Merge pull request #5259 from valdi74/update_python-curl
python-curl: update to 7.43.0.1
2017-12-10 16:51:32 -08:00
champtarandGitHub 56d5ede68a Merge pull request #5197 from commodo/python-bluez-deps
python,python3: define config option for bluetooth support
2017-12-10 16:45:40 -08:00
champtarandGitHub a0d805a79c Merge pull request #5253 from mstorchak/acl
acl: update to 20170420
2017-12-09 09:42:12 -08:00
champtarandGitHub e2605b07f0 Merge pull request #5248 from diizzyy/patch-111
net/stunnel: Update to 5.44
2017-12-09 09:41:25 -08:00
champtarandGitHub f7bec56c1e Merge pull request #5252 from mstorchak/attr
attr: update to 20170915
2017-12-09 09:40:58 -08:00
champtarandGitHub 228db2a2a2 Merge pull request #5245 from mstorchak/rsync
rsync: fix CVE-2017-15994 and CVE-2017-16548
2017-12-09 09:31:41 -08:00
Etienne Champetier d1b461137a prometheus-node-exporter-lua: bump version
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier ea5b7492fe prometheus-node-exporter-lua: rework cpu collector
replace 2 string.match and 1 string.gmatch (space_split)
by 1 string.match

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier ed7d60d871 prometheus-node-exporter-lua: use io.lines(), remove line_split
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 84023027a2 prometheus-node-exporter-lua: split out nat_traffic and netstat
nat_traffic is too verbose to be really useful by default
netstat is broken by default on OpenWrt/LEDE

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier fba739d32d prometheus-node-exporter-lua: put wifi collector in 2 separate packages
this allow to remove libubus-lua/libiwinfo-lua dependency from main package
this also allow to have different scrape_interval

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

split stations

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 32e1baeddd prometheus-node-exporter-lua: make it modular
As prometheus-node-exporter-lua is a reimplementation of node_exporter,
I'm using "collector" instead of "scraper" and renaming some collectors

put each collector in a separate file

report collector success/failure and duration per scrape
(follow https://github.com/prometheus/node_exporter/pull/516)

allow to filter collectors using "collect[]" params
(see https://github.com/prometheus/node_exporter#filtering-enabled-collectors)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 7b1b69ca6c prometheus-node-exporter-lua: rewrite wifi scraper
On my bullet m2, scrape duration goes from between 0.2 and 0.5 to a stable 0.025
We also don't depend on luci anymore

This remove wifi_network_up metric, but this metric was buggy
wifi_network_up{ifname="wlan0-1",ssid="test1",channel="11",mode="Master",bssid="12:34:56:78:9A:BC",country="FR",frequency="2.462"} 1
wifi_network_up{ifname="radio0.network2",ssid="test1",channel="11",mode="Master",country="US",frequency="2.462"} 0

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 747f4ce7af prometheus-node-exporter-lua: fix nat scraper
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 58c136a521 prometheus-node-exporter-lua: improve node_uname_info
Testing on a bullet m2, uname collector was taking on average 0.12
it now takes 0.0007

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier c79e75d0c1 prometheus-node-exporter-lua: respond with HTTP/1.0
also reduce calls to output()

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 4e94edce51 prometheus-node-exporter-lua: send stdout/stderr to logread
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:22:16 -08:00
Etienne Champetier 8f7ccc3506 build,travis: SDK name now start with openwrt
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2017-12-08 21:20:54 -08:00
champtarandGitHub b259502c15 Merge pull request #5242 from smutt/danish
danish: Add package net/danish
2017-12-08 20:56:34 -08:00