diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-02-23 20:36:32 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-03-29 21:31:38 +0000 |
| commit | ddad1a1568cc6c729bcb317fae411152024437fa (patch) | |
| tree | d1f9f311efa3d0e8d8c98d61f359a338896a6819 /import-layers/meta-openembedded/meta-webserver | |
| parent | c0f7c04c3041b951defd78886f86fde99dcd8c08 (diff) | |
| download | talos-openbmc-ddad1a1568cc6c729bcb317fae411152024437fa.tar.gz talos-openbmc-ddad1a1568cc6c729bcb317fae411152024437fa.zip | |
Squashed 'import-layers/meta-openembedded/'.
1efa5d6 gpsd: fix multilib build
97b82f3 exo: unbreak Thunar's detailed file view
5829238 modemmanager: Fix build with clang
9dc61c3 libmad: Fix build with clang
3cb5bcd fribidi: Fix build with security flags turned on
c6bb220 flashrom: Remove redundant const qualifier
7ac8ead md5deep: Fix build with clang
6a08999 openldap: Fix Build error due to missing -fPIC
ae254b4 libqmi: Fix build with clang
1ae5293 android-tools: fix do_install
a67677b rsnapshot: fix host path in rsnapshot.conf.default
f98f05a xfwm4: add x11 to REQUIRED_DISTRO_FEATURES
0913142 xfdesktop: add x11 to REQUIRED_DISTRO_FEATURES
4abb9bd xfce4-settings: add x11 to REQUIRED_DISTRO_FEATURES
fbb8993 xfce4-session: add x11 to REQUIRED_DISTRO_FEATURES
a7033bf xfce4-power-manager: add x11 to REQUIRED_DISTRO_FEATURES
c628fef xfce4-panel: add x11 to REQUIRED_DISTRO_FEATURES
d6ff552 xfce4-appfinder: add x11 to REQUIRED_DISTRO_FEATURES
f470662 thunar-volman: add x11 to REQUIRED_DISTRO_FEATURES
a905a4b thunar: add x11 to REQUIRED_DISTRO_FEATURES
4898fc6 libxfce4ui: add x11 to REQUIRED_DISTRO_FEATURES
4ea40f3 gtk-xfce-engine: add x11 to REQUIRED_DISTRO_FEATURES
57faeed garcon: add x11 to REQUIRED_DISTRO_FEATURES
af6a177 exo: add x11 to REQUIRED_DISTRO_FEATURES
0b91d71 xfce-app.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
33055f8 xfce-panel-plugin.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
17c9299 thunar-plugin.bbclass: add x11 to REQUIRED_DISTRO_FEATURES
e3cc8a1 xfce4-pulseaudio-plugin: add x11 to REQUIRED_DISTRO_FEATURES
968e99e packagegroup-xfce-base: add x11 to REQUIRED_DISTRO_FEATURES
3a2f97e libxklavier: add x11 to REQUIRED_DISTRO_FEATURES
7a557a2b libwnck: add x11 to REQUIRED_DISTRO_FEATURES
179bcb1 gtksourceview2: add x11 to REQUIRED_DISTRO_FEATURES
eea7d0b gnome-disk-utility: add x11 to REQUIRED_DISTRO_FEATURES
bc9450c evince: add x11 to REQUIRED_DISTRO_FEATURES
121a333 dconf: add x11 to REQUIRED_DISTRO_FEATURES
74ee171 libunique: add x11 to REQUIRED_DISTRO_FEATURES
258f4f3 pavucontrol: add x11 to REQUIRED_DISTRO_FEATURES
c30411d gtkmm: add x11 to REQUIRED_DISTRO_FEATURES
d08864a opencv: checking existence of /usr/lib
cb24773 libeigen: set tarball name as ${BP}.tar.bz2
00b89f2 opencv: fix QA issue
d8d90a6 openjpeg: rename the download file
dcfb513 apache2: include .load files in modules.d
0ec9cb2 asio: fix a musl compilation warning
c840f78 asio: DEPENDS on openssl
d2a990b lockdev: Pretend GNU libc on musl
02bca9e libplist: Remove rpaths surgically
45c2854 augeas: fix QA warning
ebc3e16 edac-utils: fix systemd service
54b566a mariadb: use faster download URL
4ef0a72 krb5: Add -fPIC to compile flags
976fccd meta_oe_security_flags.inc: Add libcec, libmodplug, libcdio
2c3aaa7 meta_oe_security_flags: Disable PIE for s3c64xx-gpio/s3c24xx-gpio/cpufrequtils
9869a2d python-m2crypto: inherit siteinfo
f169b40 ttf-abyssinica: update SRC_URI
cce0d82 xterm: package /usr/lib/X11 to avoid installed-vs-shipped error on ppc64
2e71e6a fftw: Remove the fftw-dev package dependency on non-existent fftw package.
14c4d27 Revert "physfs: move to sources found at github/supertux"
24c9c2b wireshark: install missing header files
b840fce tunctl: fix QA warning for GNU_HASH
705a4c1 vblade: fix QA warning for GNU_HASH
a3d23d2 tsocks: fix QA warning for GNU_HASH
35dfe1a zeroconf: fix QA warning for GNU_HASH
052fe5e nuttcp: fix QA warning for GNU_HASH
b6d9486 aoetools: fix QA warning for GNU_HASH
6ea4941 iscsi-initiator-utils: fix postinstall and systemd service file
dbabbd8 lftp: fix PACKAGECONFIG[readline]
6f06d75 drbd-utils: 8.9.3 -> 8.9.6
5336366 lksctp-tools: 1.0.16 -> 1.0.17
659d9d3 meta-openembedded: Add me to morty maintainer's list
6e91977 c-ares: update 1.11.0 -> 1.12.0
406ca64 libmnl, nftables: Update versions
dce441f openl2tp: Fix build with clang
aebf681 lowpan-tools: Fix errors found with clang
c8f78ec linux-atm: fix do_compile error
7a491f3 nodejs: update to 4.6.1
2396e30 openldap: use recommended backend mdb
ce2b1ac rsyslog: upgrade to 8.22.0
ca3a032 librelp: add recipe
2f7c00b libfastjson: add recipe
9af1859 vim: Update to v8.0.0022
b096119 glmark2: Enabling c++ 11 features
3587696 android-tools: fix native build
e63aa5b dhcp_%.bbappend: fix replaces original key warning
51867d2 rsnapshot: update to 1.4.2
a4f713b python-unidiff: python module for parsing diff data
b6f38dd mg: Update to 20161005
9db48dc joe: Fix build with clang
cc5414c glcompbench: Demand c++11 explicitly
b8ecf24 flashrom: Fix build with clang and aarch64
2449866 gpm: Remove nested functions
09ac7a6 libdc1394: Upgrade to 2.2.4
71670ff python-greenlet: Rename register from rX to xX for aarch64
73c6871 frame: Fix build with clang
2280f69 libplist: Squash warnings found by clang
577604b libmbim: Fix build with clang
558d935 libbonobo: Fix missing dep on orbit2-native and build with clang
3fd6133 libndp: 1.5 -> 1.6
ccec146 adduser: always add -M option for useradd
dd2748d dvb-apps: fix recipe, and update to the latest version
d0b44b7 v4l-utils: add support for "native" build
74d5222 inotify-tools: add recipe
00ba3c8 nodejs: update to 4.6.0
a87270e postgresql.inc: Fix do_configure error (could not find Python.h)
887cdc7 mpich: update to version 3.2
8cefb2e libsoc: update to version 0.8.2
1872a8a libsodium: update to version 1.0.11
a5bc9e9 python-evdev: update to version 0.6.4
d4185c6 python-dbusmock: update to version 0.16.7
ecc78a9 python-cmd2: update to version 0.6.9
c8f992c python-bcrypt: update to version 3.1.1
e15a35a python-werkzeug: update to version 0.11.11
2810af5 python-urllib3: update to version 1.18
40efc44 python-rfc3987: update to version 1.3.7
3f000b5 python-pytest: update to version 3.0.1
f35e4e6 nginx: update to version 1.11.5
951d31e python-pyopenssl: update to version 16.1.0
0a812a0 python-pymongo: update to version 3.3.0
96819dd python-pymisp: update to version 2.4.51.1
13e2470 python-prompt-toolkit: update to version 1.0.7
ee0f810 python-lxml: update to version 3.6.4
47d12fe python-cffi: update to version 1.8.3
b7ae781 python-certifi: update to version 2016.9.26
4faba62 libsocketcan: upgrade to 0.0.10
2acaa8f tipcutils: upgrade to 2.2.0
8ba31c9 gpsd, mongodb: use PACKAGECONFIG_CONFARGS instead of now empty EXTRA_OECONF
f882db6 ipmiutil: uncomment PARALLEL_MAKE
fb6585f jansson: update to 2.9
54c7e78 pcsc-lite: Seperate GPLV3 portions from BSD
fded4cf opencv: fix packaging and install
df9dac1 xdg-user-dirs: initial add 0.15
2846999 a2jmidid: initial add v8
d6cd37b jack: remove portaudio PACKAGECONFIG
0f8f197 jack: swap to jack2
a7e7ecc python-pybind11: add pybind11 for operability between C++11 and Python
7f5236b alsa-equal: Add recipe for version 0.6
def0e38 caps: Add recipe for version 0.9.24
1c072cb gvfs: fix fetch error
3796741 tesseract: upgrade to 3.04
0cc3d06 leptonica: add PACKAGECONFIG for giflib
b850fda phytool: Add recipe
8eef5ab wireshark: update to 2.2.1
5dbbc99 nfacct: added nfacct recipe to meta-networking
dd77c3d libnetfilter-acct: added new recipe for libnetfilter-acct 1.0.3
812e940 ntp : Add openssl to default PACKAGECONFIG options
8760099 atftp: fixes musl libc build
af864a7 geoip-perl: upgrade to 1.50
5abe6ea arptables: add the directory for default /etc/sysconfig/arptables
a0e2240 arptables: add arptables systemd service file
93b0d65 iscsitarget: resolve build error with linux kernel 4.8
9e8d127 squid: fix ptest failure
6f54f29 squid: specify sysconfdir and logdir
307d1c9 libtdb: fixes for deterministic builds
5175c03 libldb: fixes for deterministic builds
5291715 libtevent: fixes for deterministic builds
778a2b6 libtalloc: fixes for deterministic builds
fe652f8 libldb: fix for LIC_FILES_CHKSUM
f25aa3d libtdb: fix for LIC_FILES_CHKSUM
d4a36f6 libtevent: fix for LIC_FILES_CHKSUM
0014397 libtalloc: fix for LIC_FILES_CHKSUM
1a5ae6a mbedtls: upgrade to 1.3.17
a95726d samba: replace pam packageconfig by hard dependency
3fdfdd8 samba: un-blacklist
f604ee6 mariadb: update to version 5.5.52
6d8cbfa gmock: fixed installing pkgconfig file and libraries on x86_64 architecture
63707b5 gst-plugins-base: fix rare but annoying build errors
8b68ed9 jq: add support for jq-native + misc minor fixes
dacf9a8 onig: update 5.9.3 -> 5.9.6
a6ad786 onig: add support for orig-native + misc minor fixes
ea21a3f mpd: disable automatic start at boot - service is activated on demand by socket
c7f39c7 thrift: disable java
39b03b0 libsmi: rdepends on wget and set WGET as target path
a0ef440 mariadb: replace the CC with CC_VERSION and CXX with CXX_VERSION
b23da47 webmin: ensure correct PERLLIB path
42f52f5 ttf-lklug: use fedora24 for source
ba54b98 edac-utils: add systemd support and required dependencies for edac
6ee4e53 haveged: don't compile in mips16e mode
3e4a0e2 lvm2: enable option o_direct
3c56c4f multipath-tools: Obey exported LDFLAGS
5e17038 pam-passwedqc: Obey exported LDFLAGS
aba02d7 libnet: fixes musl libc build
08b315e rsyslog: fixes musl libc build
5a9b947 Remove bashisms
3bbec2b physfs: move to sources found at github/supertux
a0c3cea poppler: update to 0.47.0
b77869a xfce4-clipman-plugin: update to 1.4.0
81e5975 xfce4-notifyd: update to 0.3.2
13975d3 xfce4-calculator-plugin: update to 0.6.0
9e36ee0 xfce4-weather-plugin: update to 0.8.8
86fcbf9 xfce4-whiskermenu-plugin: update to 2.0.1
8d6f8cc exo: update to 0.11.1
a60b025 xfce4-power-manager: update to 1.6.0
bf02c16 php: update 5.6.25
335ea17 layer.conf: add LAYERVERSION and LAYERDEPENDS
47ab72f hostapd: Security Advisory-CVE-2016-4476
510bcc8 gperftools: fix to work on aarch64
6ba3b30 xfsprogs, xfsdump, dmapi: blacklist, needs upgrade to stay compatible with default kernel
754111f mariadb: add libdbd-mysql-perl to RDEPENDS
aad32cf mariadb: add libdbi-perl to RDEPENDS
934104c libdbd-mysql-perl: add new recipe
67d6ed4 p7zip: do not hardcode path in native wrapper script
93d85f6 mpich: fix QA issue and remove blacklist
520dee9 evince: add intltool-native to DEPENDS
b187e7c logwatch: 7.4.1 -> 7.4.3
076b261 gthumb, libgnomekbd, gnome-desktop: add dependency on intltool-native
18b35eb vboxguestdrivers: upgrade to 5.1.6 to fix build with default kernel from oe-core 4.8
b70d4e2 p7zip, mce-inject: update LIC_FILES_CHKSUM
bfa1054 mozjs: fix crash on non-x86 64 bit systems
7742daa fftw: fix native build
4e84633 fftw: fix reconfigure error introduced in previous patch
4703a3d lirc: Fix build with clang
b18ac6d gpsd: Fix build with musl
7b05caa net-snmp: Fix build issue found with musl
f4ed1bc rtmpdump: fix QA warning for GNU_HASH
c5bd43a cdparanoia: fix QA warning for GNU_HASH
b2d3dac rsyslog: upgrade to 7.6.7
0de66c2 openl2tp: Obey LDFLAGS in Makefile
9c9cee6 crash: Enforce use of LDFLAGS during make
be8aa13 grubby: add bash to RDEPENDS_grubby-ptest
dfcb67a imagemagick: depend on fftw not virtual/fftw
395cb2d fftw: build all configurations by one recipe
1edf97a ristretto: have tumbler back - it builds fine and is an important feature
64a63fc gvfs: update to 1.28.3
e3a2814 gimp: update to 2.8.18
4618962 upower: don't start on boot by default - dbus does that on demand
c1a6b86 jack: update to 0.125.0rc1
df0c384 tslib: move recipe from oe-core
fe249f8 xtscal: move recipe from oe-core
0d103ba pointercal: move recipe from oe-core
dd01b4b portaudio: upgrade to latest release
0feb5f7 poco: update to 1.7.5
82f2e2b chrony: add PACKAGECONFIG for nss, libcap
e05536c mpv: include PACKAGECONFIG_CONFARGS in EXTRA_OECONF
5d131fd libgit2: add dependency on libssh2
4f3ae98 gammu: add dependency on unixodbc
7be1355 jasper: add PACKAGECONFIG for opengl
24e387a openldap: fix CVE-2015-3276
14a532d imsettings: 1.6.8 -> 1.7.1
a3cdf02 networkmanager: Fix package splitting and systemd service issue
a617fdc minini: update SRC_URI with new download path
02f77f7 snort: Add lzma to PACKAGECONFIG
4fde248 syslog-ng: remove unused patches
c8c68fb ttf-dejavu
870df18 iscsitarget,netmap-moduls,vboxguestdrivers: Blacklist, not compatible with default kernel version 4.8
85b5755 xterm: 320 -> 325
e05f59e geoclue: Update to 2.4.4
2ed5ad2 krb5: upgrade to 1.13.6
dd0f1ad ttf-dejavu: 2.35 -> 2.37
0836228 packagegroup-xfce-base: add librsvg-gtk
39be411 python-pyyaml: 3.11 -> 3.12
94a6bb9 python-dbus: 1.2.0 -> 1.2.4
29a6cb6 tk: 8.6.4 -> 8.6.6
3b675cb thrift: fix build on gcc-6
170b5ea abiword: unblacklist and fix
3e9313c geany-plugins: unblacklist / fix known bugs / update to 1.28
d70ccec geany: update to 1.28
a0fdd7f zile: uprev from 2.4.9 to 2.4.11 and add acl support
ee23e9d python-pylint: python source code analyzer
5641b25 Revert "gpsd, foxtrotgps: blacklist, fails to build with new binutils-2.27"
c7137fd gpsd: make sure the recipe uses LDFLAGS
a231c43 android-tools: add recipe from AOSP tag android-5.1.1_r37
4fad615 collectd: CVE-2016-6254
2f15702 libqmi: fix floating dependencies
d505a7a lmsensors: sensors-detect: print a special message when there isn't enough cpu info
35ee0a0 xpext-dev: Remove RDEPEND on empty xpext package.
5b4a557 glcompbench: Fix issues causing failures in GCC6
f3cd93f glade: fix typo introduced in last patch
098d32e tcpreplay: upgrade to 4.1.1
12a1189 waf-samba.bbclass: Add PACKAGECONFIG_CONFARGS to CONFIGUREOPTS
3a436ad wireshark: update to 2.2
554bbfb traceroute: update to 2.1.0
467dc1f dhcpcd: update to 6.11.3
fbffcf3 vsftpd: allow sysinfo() in the seccomp sandbox
e4365a2 proftpd: remove the script ftpmail
10abb68 stunnel: 5.28 -> 5.35
b60c608 samba: fix build by linking with bfd instead of gold
365fd1e strongswan: 5.3.2 -> 5.5.0
b4b6465 samba: fix to package pidl in samba-pidl
dd1ddae lvm2: add PACKAGECONFIG for lvm thin provisioning
07c1512 glade3: unbreak, unblacklist and other fixes
e9b5fc1 gtkmathview: unbreak gcc-6 build and unblacklist
0368f99 libgnome: add intltool-native to DEPENDS
1b6ee01 libgsf: add intltool-native to DEPENDS
d55334c pavucontrol: replace intltool by intltool-native in DEPENDS
8f6a485 p7zip: update to version 16.02
0a5c689 upower: add systemd support
11178d1 openjpeg: uprev from 2.1.0 to 2.1.1
83bb725 rdfind: add initial recipe, rdfind 1.3.4
c0e0c77 glmark2: Fix build error due a missing space before a macro
ce01b0a imagemagick: upgrade patchset
c4ff1c9 smartmontools: 6.4 -> 6.5
84e0dbe sg3-utils: 1.41 -> 1.42
f2f1b91 rrdtool: 1.5.4 -> 1.6.0
1cb3cdc python-six: Add native and nativesdk to BBCLASSEXTEND
c0fe31f python-certifi: Add native and nativesdk to BBCLASSEXTEND
88d9c59 python-pyopenssl: Extend recipe to support Python 3
80b2d4d samba: blacklist, fails to build with new binutils-2.27
df531c5 accel-ppp: blacklist, fails to build with new binutils-2.27
d0f90f8 crda: fix QA Issue: No GNU_HASH in the elf binary
fab248a openvpn: 2.3.8 -> 2.3.9
3143193 squid: don't do squid-conf-tests at build time
615872a inetutils: fixes for ipv6 feature
20681ef znc: control ipv6 support based on DISTRO_FEATURES
940a621 wolfssl: control ipv6 support based on DISTRO_FEATURES
59a9d6f tnftp: control ipv6 support based on DISTRO_FEATURES
513ae03 tftp-hpa: control ipv6 support based on DISTRO_FEATURES
bbba35e stunnel: control ipv6 support based on DISTRO_FEATURES
020db7d squid: control ipv6 support based on DISTRO_FEATURES
23b7656 ntp: control ipv6 support based on DISTRO_FEATURES
823570b mtr: control ipv6 support based on DISTRO_FEATURES
021e60b daq: control ipv6 support based on DISTRO_FEATURES
2e10d8f cyrus-sasl: control ipv6 support based on DISTRO_FEATURES
d4b6c7d chrony: control ipv6 support based on DISTRO_FEATURES
c13a706 iscsitarget: fix QA warning for GNU_HASH
1157490 ipvsadm: fix QA warning for GNU_HASH
490d792 yp-tools: fix compile errors
c7e8da3 squid: add missing patch header
e3a0a0b postfix: 3.0.3 -> 3.1.1
908a27c lftp: 4.6.3a -> 4.7.3
215740d ifenslave: upgrade to 2.7
13434cb wireshark: update to 2.0.5
291946d directfb: add PACKAGECONFIG for inputdrivers
0d4f922 geany-plugins: blacklist because of QA issues
e19c4ab tracker: blacklist, fails to build with new binutils-2.27
939b83a gnome-menus, gnome-panel3, gnome-control-center: blacklist, gnome-menus fails to build because of python
8c29023 gpsd, foxtrotgps: blacklist, fails to build with new binutils-2.27
c63f9c4 openwsman: 2.6.2 -> 2.6.3
bb7101e lua: 5.3.2 -> 5.3.3
038a6e7 thin-provisioning-tools: add version 0.6.3
2e386b7 lvm2: tweak MODPROBE_CMD for cross compile
99d4505 php: update to 5.5.38 and 5.6.25
cfbbe3f gnome-keyring: Turn off QA check dev-elf
40a075a python3-jsonschema: set dependency to vcversioner
2cdd3d6 python3-vcversioner: add recipe
2fe1b29 asio: fix musl compilation (strerror_r)
cc9b89f networkmanager: 1.0.10 -> 1.0.12
353a8c3 mcelog: 1.09 -> 1.40
709bd23 mailcap: 2.1.45 -> 2.1.46
f119c2a gtk-doc: disable where necessary
13b511c gnome-control-center, gthumb: correctly remove a file from the source tree
3b0093c libglade: add a recipe from oe-core
19dc711 krb5: Fix S4U2Self KDC crash when anon is restricted
0887841 vim: split tools directory into vim-tools package
ac960a6 openldap: 2.4.43 -> 2.4.44
bf918d5 libhugetlbfs: add libhugetlbfs-perl to RDEPENDS
aedcb85 gitpkgv: Fix $GITPKV for a single named git source
996f296 nodejs: update to 4.5.0
5dbdf0c xfce4-mailwatch-plugin: control ipv6 support based on DISTRO_FEATURES
20d4b5c cherokee: control ipv6 support based on DISTRO_FEATURES
a37ad37 php: control ipv6 support based on DISTRO_FEATURES
07539fb iperf: control ipv6 support based on DISTRO_FEATURES
ad30a26 geis: Add python3-argparse module to RDEPENDS
010d99d efivar: fix PIC not found
26b1013 python-requests, python3-requests: Update to version 2.11.1
ed70cd5 python-pysocks, python3-pysocks: Add recipe for version 1.5.7
43895d9 python-prompt-toolkit, python3-prompt-toolkit: Add recipe for version 1.0.6
97691e5 python-ndg-httpsclient, python3-ndg-httpsclient: Add recipe for version 0.4.2
70978e3 python-wcwidth, python3-wcwidth: Add recipe for version 0.1.7
83fb5cc python-py: Extend recipe to support Python 3
9dda623 python-pytest: Extend support to python 3
1d68def python-pretend: Extend recipe to support Python 3
7d5ec62 python-iso8601: Extend recipe to support Python 3
c4728e0 python-cryptography-vectors: Extend recipe to support Python 3
2eb51b6 python-urllib3: Extend recipe to support Python 3
6a144af python-pyopenssl: Extend recipe to support Python 3
775a576 python-pycparser: Extend recipe to support Python 3
96b1670 python-pyasn1: Extend recipe to support Python 3
57ce75d python-idna: Extend recipe to support Python 3
559ec40 python-cryptography: Extend recipe to support Python 3
445e595 python-cffi: Extend recipe to support Python 3
90eedcc core-image-minimal-xfce: add kernel modules to image
2892bd6 vboxguestdrivers: Add recipe for vbox 5.x
fef7b1f libqb: 0.17.1 -> 0.17.2
7e8eb9a yaffs2-utils: fix QA warning for GNU_HASH
62799e1 libnet-dns-perl: 0.81 -> 1.06.
c0e4ad7 nodejs, arm: map TUNE_FEATURES to --with-arm-fpu parameters
dcba10c nodejs: use shared zlib instead of bundled one
0a2bd4f poco: update to 1.7.4
bd9f653 Revert "testfloat: Fix No GNU_HASH in the elf binary warnings"
8579f18 testfloat: Fix No GNU_HASH in the elf binary warnings
dc48e76 meta-oe: remove trailing spaces
303a585 meta-oe: remove PR = "r0"
289217b meta-oe: fix indentation
f2bec07 nginx.inc: use 4 spaces for indentation
8e6425c nginx: optimize systemd unit file
6c7c69c spitools: bump git revision (SRCREV)
7988dfe collectd: make /etc/collectd.conf a CONFFILE
8885e4a testfloat: Fix No GNU_HASH in the elf binary warnings
c4ea812 wipe: fix QA warning for GNU_HASH
7fdf353 libx86-1: fix QA warning for GNU_HASH
107689a meta-oe: Standardize use of "_append" versus use of "+="
1a2cfa6 libdbi-perl: 1.634 -> 1.636
3c598be libedit: 20150325-3.1 -> 20160618-3.1
60b675a hwdata: 0.288 -> 0.291
b7ab152 python-jsonschema, python3-jsonschema: Add recipe for version 2.5.1
25b5e35 python-strict-rfc3339, python3-strict-rfc3339: Add recipe for version 0.7
9756c90 python-functools32: Add recipe for version 3.2.3-2
6713a6b python-webcolors, python3-webcolors: Add recipe for version 1.5
06b06a3 python3-requests: Add native and nativesdk to BBCLASSEXTEND
7fdedb7 python3-click: Add native and nativesdk to BBCLASSEXTEND
f0c1242 python-rfc3987, python3-rfc3987: Add recipe for version 1.3.6
6e17cf0 python-progress, python3-progress: Add recipe for version 1.2
4efb76b gperftools: upgrade to 2.5
41abb7e dialog: 1.2-20150920 -> 1.3-20160424
c7419bb ctapi-common: 1.1-11 -> 1.1-14
1c080cc corosync: 2.3.5 -> 2.4.0
0ebc756 python-requests: update to version 2.11.0
ccae17a python-monotonic: fix RDEPENDS for minimal python install
6fea657 python-monotonic: update to version 1.2
52cb4d5 python-jsonpatch: Fix RDEPENDS to work on minimal python install
3c20885 python-jsonpatch: update to version 1.14
7cf433a python-daemonize: update to version 2.4.7
7d12dd4 opensc: update to version 0.16.0
30ef6ad libp11: update to version 0.4.0
1aaa57e engine-pkcs11: update to version 0.2.2
dcf56c9 utouch-mtview: remove blacklist
0fcdae1 utouch-frame: fix build errors associated with xmllint
469a6ca nginx: PACKAGECONFIG for httpv2
9e78e4b thunar-volman: Fix build with clang
b415e2a udisks2: Update to 2.1.7
30eb09f libgphoto2: Fix build when security flags are enabled with clang
46248dc php: fix aclocal-copy aclocal-copy
63d1973 python-pymisp: Update to version 2.4.49
1df4b34 python-lxml: update to version 3.6.1
622788e python-cython: update to version 0.24.1
e38635e python-certifi: update to version 2016.8.8
d1ebcbc gd: update to version 2.2.3
bb689de imagemagick: Add new PACKAGECONFIG for graphviz
8900925 libp11: fix fetch error.
ec66063 imagemagick: upgrade from 6.9.2 to 7.0.2
02a390b tnftp: tnftp20130505 -> tnftp20151004
5fdc25a proftpd: 1.3.5a -> 1.3.5b
5793d60 libnftnl: 1.0.5 -> 1.0.6
af7893c radvd: 2.11 -> 2.14
4c8b9e1 geoipupdate: 2.2.1 -> 2.2.2
999f6c4 geoip: 1.6.6 -> 1.6.9
617d495 dovecot: 2.2.21 -> 2.2.25
10a1066 dnsmasq: update to version 2.76
e86c7ef opensaf: make sure /etc/init.d/opensafd exist
35326fa samba: upgrade to 4.4.5
6555c34 libldb: upgrade to 1.1.27
174a083 ctdb: upgrade to 2.5.6
e37d93f libtdb: upgrade to 1.3.10
80d23a2 libtevent: upgrade to 0.9.29
4e0bc78 libtalloc: upgrade to 2.1.8
fcdd7e2 quagga: 0.99.24.1 -> 1.0.20160315
74d994e samba: remove ${localstatedir}/log
2cf000c wireless-regdb: update 2014.11.18 -> 2016.06.10
2ea482d crda: split wireless-regdb out into own recipe
1ea6e9a proftpd: fix system account login failure
4307c6a squid: fix configure host contamination
f849b9f utouch-frame,utouch-mtview: Blacklist
b76cee6 ninja: update to version 1.7.1
10670f5 xf86-video-ati: Set RRECOMMENDS to linux-firmware-radeon
894f7ce gateone: remove custom prefix for /var
fdeb947 glog: Update to version 0.3.4
32e7012 gflags: New recipe
6752cba python-pygobject: update to version 3.20.1
66e6830 hiawatha: update to version 10.3
1a8e7aa hiawatha-init: create log directory during init
3146e64 evtest: update to version 1.33
f1dcff4 espeak: fix package for gcc6
42dd9f3 pidgin: upgrade to 2.11.0
7f30230 efivar: 0.23 -> 0.24
2ad60db nginx: update to version 1.11.3
ea75c65 nginx: add the LDFLAGS to the link arguments
2646e97 epeg: update to the latest version
5a81915 dstat: update to version 0.7.3
355cdb7 libmbim: update to 1.14.0
e22b9e0 upower: update to version 0.99.4
d95a980 devicekit-power: remove obsolete package that was migrated to upower in 2010
7c25fa4 daemonize: update to version 1.7.7
5f9728d cryptsetup: update to version 1.7.2
7151a9d breakpad: disable ppc from being built.
7e2e442 mongodb: failes to build on ppc
8ddc1b0 concurrencykit: fix fetch errors.
ff38717 openwsman: fix fetch error.
87cc923 engine-pkcs11: fix fetch error
35d56a1 libmicrohttpd: update 0.9.49 -> 0.9.50
03220d6 ttf-lklug: add version 0.6-14.20090803cvs.fc24 to support Sinhala language
185f576 ttf-lohit: add version 2 to support Indian languages
8cb799e fontforge-native: support python module
59d7086 ttf-abyssinica: add version 1.500 to support Amharic language
98c0577 glmark2: Fix gcc 6 deprecated declaration error
c29c7ed glmark2: Fix gcc 6 configure error
9405f93 libmodbus: update to upstream develop version 3.1.4
886a5da opencv: Fix build with gcc 6.0
2e0332c rygel: add intltool-native dependency
ed969f3 gparted: add intltool-native dependency
c598865 libgxim: add intltool-native dependency
0cd0b09 networkmanager-openvpn: add intltool-native dependency
6a6438b gnome-bluetooth: add intltool-native dependency
9dd576b dconf: add intltool-native dependency
3d0ca85 gupnp-tools: add intltool-native dependency
9e92fdc gegl: add intltool-native dependency
c16a8d6 gtksourceview2: add intltool-native dependency
8d84f58 geoclue: add missing intltool-native dependency
5f7fc33 gnokii: add missing intltool-native dependency
e231b02 libgit2: add a recipe for libgit2 version 0.24.1
fdb1bbe daemontools: fix QA Issues for daemontools and fix a warning for daemontools-native
92c500e postgresql: 9.4.5 -> 9.4.8
aff7b7e ccid: update to version 1.4.24
5d05955 asio: update to version 1.10.6
8bed54a Revert "gnome-disk-utility: blacklist because of avahi-ui"
70e7f34 meta-gnome/layer.conf: enable gtk for avahi-ui
4947695 xerces-c: upgrade to 3.1.4
b0ae995 ninja: support target builds
41414e0 adduser: upgrade to 3.115
7f4f2d7 grubby: fix no GNU_HASH warning
e48d02b network-manager-applet: addmissing intltool-native dependency
1d41fe4 mozjs: Fix incorrect usage of PN.
db97c32 gedit: remove blacklist caused by gtksourceview2 / fix/cleanup build
2ed31c7 modemmanager: update to 1.6.0 and unblacklist - libqmi was fixed
5b5bad7 libqmi: update to 1.16.0
2c86452 libgnomeui: update to 2.24.5 / fix build on gcc6 / cleanup
e9bf73f nostromo: add dependency for nroff used during compile phase
aac86aa nostromo: remove useradd of a user already provided by base-passwd
da81d9e proftpd: return stderr to syslog
bc8fd52 ntp: make ntp and alternative for ntpd
32a6fd4 samba: inherit update-rc.d to manage init script
8b28f07 bridge-utils: various build fixes (musl & CFLAGS)
9fb484e proftpd: clean the host path in prxs
85d96d1 proftpd: fix PACKAGECONFIG settings
f8dd8cd proftpd: start at boot time
4c854d2 wireshark: inherit perlnative
03b76ca squid: upgrade to 3.5.20
fa2c10c curlpp: fix QA issue for cav-octeon3
3683e46 snort: fix to remove from blacklist
b2eae93 meta_networking_security_flags.inc: add weak assignment for lcl_maybe_fortify
abf5445c meta-networking: override SECURITY_CFLAGS for c-ares
6204c13 c-ares: use our compilation flags
53794a7 atftp: do not create user nobody
7e4f225 python-mccabe: Remove unnecessary setup_requires pytest-runner
6cb4eb3 mercurial-native: upgrade to 3.8.4
7482f2d libssh2: Add native to BBCLASSEXTEND
cfdf135 nostromo: update to version 1.9.6
181f5f8 webmin: upgrade to version 1.801
df5141a libssh2: upgrade to 1.7.0
d71cccd libssh: upgrade to 0.7.3
d98b1a3 sysbench: add new recipe
a720b93 libnih: add new recipe to meta-oe
26fbc9b libebml: fix do_unpack failure
8f4c447 packagegroup-tools-bluetooth: Fix incorrect LIC_FILES_CHKSUMs
30eab2d xfce4-vala: unbreak by telling configure new vala API version
6255219 mariadb: upgrade to 5.5.50
4b24a6c psqlodbc: Add the new recipe
8bb4a8b unixodbc: Add the new recipe
f9f8578 efivar: add COMPATIBLE_HOST item
f5da671 x11vnc: fix do_patch failed
292d8f1 Revert "postgresql: blacklist because tcl in oe-core is broken for last month"
b142ab5 python-imaging: Fix CVE-2016-2533
6398643 juce: Improved juce class and recipes
3bbc28d juce: Added support for JUCE framework
ca6edca python-pygpgme: update tests
8dca4ab python-pygpgme: update ptest output format
9bf3e36 collectd: replace deprecated readdir_r() with readdir()
5ed0925 makedumpfile: add makedumpfile 1.6.0
a63b404 minicoredumper: add the recipe
014c361 grubby: add grubby 8.40-1
520610b xfce4-terminal: add dependency on vte9-termcap
1a6e6a9 phpmyadmin: upgrade to 4.6.3
aa01ab9 php: update to 5.5.37 and 5.6.23
0b6853f ttf-vlgothic: add a ttf font
5a319d3 ttf-liberation-sans-narrow: add a ttf font
06e58b6 cfengine: add recipe and base policy
898b397 tokyocabinet: add recipe
00f6dc9 poco: update to 1.7.3
958bfe3 contrib: add MIPS_INSTRUCTION_SET
ba733d1 klibc: fix install destination in 64bit env
eeaf3dd uw-imap: use cross-tools to create static library
4c03228 augeas: Move from oe-core
74466fc libsodium: Update to 1.0.10.
d0c4bdc zeromq: Update to version 4.1.5.
7707dd5 apache2: update to version 2.4.23
97e2e15 freeglut: add opengl to REQUIRED_DISTRO_FEATURES
9efd12b nginx: update to version 1.11.2
96fd3c5 mousepad: remove blacklist caused by gtksourceview2
ca36344 gtksourceview2: fix build with gcc6
a1647ea Mpd: use libsystemd
273be2e directfb: move recipe to meta-oe
37e1dd1 sshfs-fuse: update to 2.8
20df863 nodejs: update to 4.4.7
d209e32 x11vnc: remove redundant RPATH to fix QA issue
e7aeb11 libxfce4ui: Use native intltool for building the lib
b813911 cpuset: add new python package
ecf41ac libmad: add the recipe
1f87c7f mpg123: remove the recipe
5c69367 python-flask-bootstrap: update to version 3.3.6.0 and fix RDEPENDS
9d1d1e8 python-flask-navigation: update package RDEPENDS
06c87ef python-flask-bcrypt: update package RDEPENDS
01b7c1d python-flask: update RDEPENDS to include python-click
d070f5a python-click: add recipe for the python click package required by the new version of flask
a7195fc python-feedformatter: add package RDEPENDS
7ebe715 python-evdev: update to version 0.6.1 and add package RDEPENDS
18d5f11 python-feedparser: add package RDEPENDS
878ec0c python-epydoc: add package RDEPENDS
2daf0b0 python-dominate: update to version 2.2.1 and fix RDEPENDS
786b54e python-flufl-enum: remove deprecated package
468e565 python-django-south: add package RDEPENDS
795dc3f python-django: update to version 1.9.7 and add the required RDEPENDS
ac2336f python-dbusmock: update to version 0.16.6 and update required RDEPENDS
3cac200 python-cmd2: update RDEPENDS to pull in required packages
ae9a0c5 python-cryptography: update to version 1.4 and remove patches now available with the latest release
d212af4 lirc: inherit python3native instead of pythonnative
5e18b65 python-cffi: update to version 1.7.0
ca90791 python-decorator: add package RDEPENDS
9a3bf8e python-backports-ssl: add package RDEPENDS
8cde32a python-bcrypt: update to version 3.1.0
9c00cf3 python-six: update RDEPENDS to work on both python2.7 and python3
8d55746 python-werkzeug: update RDEPENDS to work for minimal python2.7 and python3
df36dff pyrtm: Add RDEPENDS to the package
04923b4 pyrtm: update to version 0.4.2
97f8a24 python-pyephem: add RDEPENDS to package
d27ad56 python-ujson: correct RDEPENDS to pull in needed python packages
63ebe28 python-urllib3: correct RDEPENDS to work on a minimal python instance
aa16b31 python-urllib3: update to version 1.16
b7efea7 python-vcversioner: add RDEPENDS for the package
bc892fb python-vcversioner: update to version 2.16.0.0
045d79e python-visitor: update to version 0.1.3
569cab0 python-vobject: add RDEPENDS for the package
5b4b806 python-vobject: update to version 0.9.2
f8ccd64 python-werkzeug: update to version 0.11.10
39fdd2e python-wtforms: add RDEPENDS to work correctly in minimal python environment
8f85bf0 python-wtforms: update to version 2.1
53f8a49 python-yappi: correct RDEPENDS to work on a minimal python install
d04adba python-zopeinterface: update to version 4.1.1
4e52a2e python-tornado: remove deprecated version 2.2.1
001dad1 python-xlrd: add RDEPENDS to allow module import with a minimal python install
5cfe9e7 python-xlrd: update to version 1.0.0
812162c meta-python: Add Derek Straka as a maintainer
4b65102 python-imaging: Add patch to fix host sysroot fails
f735a9c python-setuptools-scm: Add python-setuptools-scm bb
a9b7ae5 python-pytest-runner: Add python-pytest-runner bb
45baacb python-mccabe: Add python-pytest-runner dependency
8027e53 python-mock: Add python-pbr-native dependency
093d271 python-pbr: Add python-pbr bb
4fbb4d2 net-snmp: initscripts are located in net-snmp-server-snmp package
582eddb net-snmp: fix snmpd crash via AgentX connection
a27d4a7 openconnect: PACKAGECONFIG certain dependencies
303d9ea python-pyserial: update to version 3.1.1
e4691bb python-pymisp: update to version 2.4.48.1
116d715 python-flask: upgrade to version 0.11.1
0f89c4b python-decorator: update to version 4.0.10
5f92f38 python-yappi: add a recipe for a python profiler
45fc7c1 python-pyephem: update recipe to use the pypi class
1bef833 python-m2crypto: update recipe to use the pypi class
14e11e7 python-pyro4: update recipe to use the pypi class
7edad4d pypi: update the base pypi url to use the package info without requiring the hash
216e956 netmap: blacklist
b6e805c Samba: use only libsystemd
6b2fc93 lftp: fix issues with multiple signbit definitions and remove from the blacklist
3647a2c crda: fix errors about unused variables and remove from the blacklist
1cb7275 gnome-terminal, toscoterm, vala-terminal, xfce4-terminal: use vte9
ce37942 vte9: Add old vte into meta-oe
377d67a gtest: fix installation in multilib
5cdb839 gnome-disk-utility: blacklist because of avahi-ui
7a925f7 analyze-suspend: Bump to latest Git version
0e10dc7 efl e-module.inc: fix fetching in multi-lib configs
c29c8e3 krb5: add systemd support
016e748 Revert "python-pygobject, python-cloudeebus, python-dbusmock: Blacklist because of python-pygobject is broken"
0963084 python-cloudeebus: fix do_compile failure
c06411f python-pygobject: fix do_configure failed
64d874f libebml: don't rely on make -e, obey LDFLAGS
cff7a47 vboxguestdrivers: obey LDFLAGS
55dfb1b epdf, evince, tracker, gimp, tumbler: Remove blacklist caused by poppler build failures
979760c evince: fix build errors with gcc-6
675d1df poppler: fix ambiguity on math functions related to gcc-6
9b9eb83 faac: address gcc-6 narrowing errors via an explicit cast
d516719 libqmi: update to version 1.14.2
559c14a crash: update to version 7.1.5
80def85 geis: add a patch to fix incorrect indentation issues and remove -Wno-error=misleading-indentation
90488aa tvheadend: add a patch to fix issues with gcc 6 and drop the -Wno-error=misleading-indentation
d24e984 p7zip: update to version 15.14.1
0647b7d iperf: resolve issues with gcc6
e092a95 v4lutils: Update to latest upstream
9222832 libgphoto2: correct compatibility issues with libjpeg-turbo-1.5.0
7e8e0fb python-pyephem_3.7.6.0.bb: Add new recipe.
19ef3af gtk-engines: Move from oe-core
9cd117a chrony: Versatile implementation of NTP
5c8efcc curlpp: fix build with gcc-6 and remove blacklist
f316c4a wireshark: update to 2.0.4
13db3c6 ntp: Security fixes via Upgrade to 4.2.8p8
f0756d1 crda, lftp, curlpp: blacklist, fails to build with gcc-6
0561402 libgphoto2, v4l-utils: blacklist, not compatible with libjpeg-turbo-1.5.0
c119940 grail: update to version 3.1.1
ee42aeb fwts: add CFLAG to ignore misleading indentations
629d67a geis: add CFLAG to ignore misleading indentations
0aac049 tvheadend: add CFLAG to ignore misleading indentations
baa1ab2 fbreader: fix return code issue on gcc6
47e84b3 tcsh: fix the wait definition to support gcc6
87fc6bb geos: use std::isnan to support gcc6
aebac65 libeigen: update to 3.2.8
03f0be6 mpv: use waf.bbclass
7d399ca mpv: add DESCRIPTION
431ec7e libcgi-perl: add version 4.28 to provide perl-module-cgi
af6af86 redis: fix hiredis build so it's less failure-prone and links properly
548effe ruby.bbclass: Fix usage with python3
44ea80d postgresql: blacklist because tcl in oe-core is broken for last month
b0fae32 python-pygobject, python-cloudeebus, python-dbusmock: Blacklist because of python-pygobject is broken
33fc64c faac, iperf, crash, espeak, open-vcdiff: blacklist, fails to build with gcc-6
25a78e5 abiword, fbreader, tvheadend, glmark2, libqmi, modemmanager, thrift, wvdial, wvstreams, dt, collectd, gtkmathview, tcsh, glcompbench, geos, libspatialite, geis, grail, opencv, openwbem, fwts: blacklist, fails to build with gcc-6 or glibc-2.24
d78c521 evince, epdf, gdm, gnumeric, libgnomeprint, tumbler, gedit, gnome-panel, gnome-session, gnome-terminal, libgnomecups, gtksourceview2, libgweather, libgnomeui, tracker, gimp, poppler, mousepad, goffice, tasks: blacklist, fails to build with gcc-6
25e9400 fwts: Remove 14.09.00, newer 14.12.00 is in recipes-test
6dcee71 elementary, evas-generic-loaders: Drop poppler dependency
5221399 mpv: Media Player
1847d0b libass: add newer version
e781f8e mpd: update to 0.19.15
d609617 meta-oe: override SECURITY_CFLAGS for llvm3.3
f90b8d3 toybox: Upgrade to 0.7.1
3ff2e22 libftdi: update to 1.3
8b32e60 nginx: update to version 1.11.1
98c4e4f nginx: update stable version to 1.10.1
b5091a1 python-tornado: add missing python2 runtime deps
7650008 python-singledispatch: initial recipe for version 3.4.0.3
4c110ff python-backports-abc: initial recipe for version 0.4
4594d24 syslog-ng: expand service file @variables@ earlier
b27938b opencv: Reorder PACKAGES variable
d0952ad opencv: Make gphoto2 dep optional via PACKAGECONFIG
24fe575 abiword, gnome-vfs: Use print as a function
80cf5e0 netmap-modules: Avoid type warning with python v3
55cb2ec gitkpkgv: Ensure files are closed
b4d7caa gnome-doc-utils-stub: add a recipe
f0de8ed cmpi-bindings: fix build with python 3
a18991d python-pygobject: add a recipe
4f93338 python-pyrex: add a recipe
56a4d21 python-imaging: add a recipe
25a0003 python-dbus: add a recipe
f9ce43c Remove unnecessary exports of HOST_SYS and BUILD_SYS in python-based recipes
e5f01ca nano: fix license to GPLv3.
240e2eb plymouth: allow disabling the dracut dep
852cd67 luajit: fix build issues, obey more vars
0cce9fe efivar-native: fix compile failure with older host gcc (<=4.6)
25f31a5 nodejs: update to 4.4.5
ff41698 gnome-menus: Fix QA warnings.
c2c895e python-simplejson: change to setuptools
350bd0b dvd-apps: Fix several QA WARNINGS
6de06e4 geany-plugins: fix build
7be16bc libldb: add missing libaio dependency
126e48c libtalloc: add missing libaio dependency
81f3fb0 libtdb: add missing libaio dependency
18a1d69 libtevent: add missing libaio dependency
a6a3671 cifs-utils: make samba conditional dependency
d765990 netcat-openbsd: fix qa warning
a2256bb esmtp: Fix rootfs creation errors
7832c67 postfix: Fix rootfs creation errors
62e3df2 netkit-rsh: fix build issue.
880c3dc opensaf: update to 5.0.0
d46c89a squid: CVE-2016-4553
9a13040 ntp: avoid floating dependency on mdns (aka mDNSResponder)
387824f openct: Fix rootfs creation errors
e49c2c2 iptraf: Fix rootfs creation errors
5ec8663 fontforge: add back gnulib to DEPENDS
5adc7db florence: move to latest GTK2 version 0.5.4
5cc904b python-thrift: update to version 0.9.3
ad7fb0f python-urllib3: update to version 1.15.1
9a527fc python-pyudev: update to version 0.20.0
79174d7 python-pytz: update to version 2016.4
2383776 python-pyroute2: update to version 0.3.22
9e37a25 python-pyparsing: update to version 2.1.4
faa6511 python-pyopenssl: update to version 16.0.0
b1ca690 python-pyflakes: update to version 1.2.3
00ec1d5 python-psutil: update to version 4.2.0
3fe43f5 python-pip: update to version 8.1.2
b031bef python-monotonic: update to version 1.1
852f2a7 python-mock: update to version 2.0.0
81b3aa3 python-greenlet: update to version 0.4.9
beb3060 python-enum34: update to version 1.1.6
80517d2 python-cffi: update to version 1.6.0
87c914b python-backports-ssl: update to version 3.5.0.1
ab22ea3 sthttpd: update to 2.27.0
02b52ee freeglut: Add a recipe freeglut to replace mesa-glut
bb26012 mesa-glut: Remove the recipe
b917018 assimp: Add recipe for Open Asset Import Library
21a9e43 initramfs-kexecboot-klibc-image: Skip for nios2
f6db877 x11vnc: remove old libtool macros from acinclude.m4
a3d4309 networkmanager: add missing dep on dbus-glib-native
0839562 networkmanager: add missing dep on intltool-native
b22c290 openlmi-networking: add missing dep on konkretcmpi-native
4972132 mg: stop relying on make -e
2318f8e llvm: make llvm-config wrapper error message more understandable
4ff633a uim: Fix Warning
35c3f12 geany-plugins: initial add 1.27
1d4d6e7 geany: update to 1.27
5ce609f poppler: update to 0.43.0
207e971 python-cryptography: fix compile issue with openssl 1.0.2h
33f5a5b apache2: fix libtool's path in apxs
5e5e66d python-requests: update to version 2.10.0
319bbc1 python-pymisp: update to version 2.4.36
9aa6735 python-flask-login: update to 0.3.2
ae20c6d python-flask-pymongo: update to 0.4.1
daf619e rrdtool: only unset PERLHOSTLIB in do_configure
5ad18c4 pytest: fix runtime issues.
569b11c obexftp: mark as compatible with bluez5
5da9408 krb5: fix uninitialized variable warning
87084fe libhugetlbfs: enable build for x86-32
c9c82d3 efivar: fix unknown option while gold linker used
beac69f efibootmgr: sync with upstream while efivar upgraded to 0.23
f0a1e61 efivar: fix do_install failed
d68c687 efibootmgr: update and unblacklist
fe4cb8b efivar: update to 0.23
bee16ff gnulib: bump git revision
44a13e6 libsoc: update to 0.8.1
901b9a2 libxkbui: Fix license WARNING
09ccbeb python-numeric: Add LLNL license
df2e3bb netcf: unconditionally remove gnulib dir to support reconfigure
8fe7d1e proftpd: fix mod_tls build issue
37297c3 nbd: fix LIC_FILES_CHKSUM
23ce88c znc: fix QA issue and remove from blacklist
0939421 netcf: fix mishandling of gnulib submodule causing build fail
00ec8bc autotools-bootstrap: make bootstrap package specific.
273d797 wireshark: Fix new QA Error
8b5662b curlpp: fix recipe
2f3a499 nodejs: update to 4.4.4
3384b41 upower: fix WARNING
76754d0 libwnck: fix WARNING
631efea python-dateutil: update to version 2.5.3
e62215e pypi: update the pypi class to support the updated URL scheme
ef735bb acpitests: Fix license issue
c45e8a3 tracker: update run-time dependencies
0f808a9 tracker: add missing depends for intltool-native
aebbd94 tracker: add a patch to support giflib 5
1bc1405 libnice, farsight2: unblacklist as libnice's nice.pc issue fixed.
786ab84 wvstreams: fixing segfault with new gcc optimizations
102e699 llvm3.3: Disable auto -dbg packages
5397ae5 packagegroup-tools-bluetooth: Selects the tools appropriate for the version of bluez being used.
4adec18 lmbench: avoid gcc optimize-away multiplication
35c7a5b leptonica: add PACAKGECONFIG for openjpeg
f347220 leptonica: update to version 1.73
904fd8d giflib: update to version 5.1.4
a6c172e poppler: add --std=c++11 to fix build with Qt 5.7
9087a59 pidgin: use pkg-config instead of hardcoded paths or python-config
fc1ee27 pidgin: add PACKAGECONFIGs
2ff8e7e pidgin: Update to 2.10.12
0980690 toybox: Upgrade to 0.7.0
3391c2e toybox: Remove out-of-date patch
be3d4c0 rrdtool: fix do_configure failure on some hosts
b957e27 python-pyparsing: modify build to correctly use setuptools rather than distutils
3132af1 opencv: Fix metapkg dependencies for opencv-java and opencv-locales
5bece73 fbreader: add cflags fix for fribidi 0.19.7
821414a protobuf: split package to main and compiler packages
3bae88a protobuf: add protobuf-c recipe
a78aebb packagegroup-tools-bluetooth.bb: Selects the tools appropriate for the version of bluez being used.
c7265a6 glmark2: wl_surface should be destoryed after destroying wl_window
f4ee554 xfce4-eyes-plugin: update to 4.4.5
d2e10b7 xfce4-cpufreq-plugin: update to 1.1.3
e211113 fluidsynth: set correct portaudio packageconfig dependency
7632939 xfce-polkit: fix warning not able to copy license
b86f2fa meta-xfce: add intltool-native to DEPENDS
c31ccab vim: Upgrade to v7.4.1689
6c0caad tinymembench: update to version 0.4.0 plus bug fixes
72c6229 nginx: update to version 1.9.15
e7ead2b nginx: update stable version to 1.10.0
c1ede48 iperf3: update to version 3.1.2 plus bug fixes
3df0760 iozone3: update to version 434
a29cece fio: update to version 2.9
4a47738 fribidi: update to version 0.19.7
7af4e55 sox: dep on ffmpeg, not libav
0307151 syslog-ng.inc: fix prerm script & class includes
1bd027e sblim-sfcb: add missing dependency on unzip-native
c22af99 libmicrohttpd: update to 0.9.49
c16b6e6 fluentbit: add new recipe
cdd326f fbida: use separate builddir
e03e5d6 netdata: replace deprecated 'base_contains' with 'bb.utils.contains'
546d55d netdata: fix whitespace in the patch that caused failures when applying
23a1c2e netdata: add new recipe
831f710 ltrace: Remove deprecated readdir_r()
a61cb51 ltrace: Error Fix for ARM
53adf32 thrift: Add recipe for Apache Thrift.
f79a851 squid: CVE-2016-3947
275b6c3 meta-networking: use bb.utils.contains() instead of base_contains()
7a9c626 wireshark: update package to 2.0.3
abc6e49 rp-pppoe: Fix rootfs creation errors
1296817 openconnect: add missing dependencies
6830c3b proftpd: CVE-2016-3125
f59daf6 samba: remove dependency on ctdb
8cd5bc5 ntp: Security fixes via update to 4.2.8p7
ce61eea dovecot: fix QA issue and remove from blacklist
73fa6a9 net-snmp: enable ipv6 support
aa8e156 samba: fix paths in sysv initscript
ffeb84e samba: fix QA warnings.
6fbaf07 mozjs: fix configure host contamination
b5a7dfb mariadb: Fix rootfs creation errors
d1be64c wayland-fits: update, get out of PNBLACKLIST
0d857a1 hwdata: add new recipe
98951db rsnapshot: use ${bindir} as rsync location
1e17ae1 mozjs_17.0.0.bb: Fix do_srpm error
4d6c013 krb5-CVE-2016-3119.patch
c16d59f xfce4-weather-plugin: update to 0.8.7
18e5f63 xfce4-whiskermenu-plugin: update to 1.5.3
eeac9ad poppler: update to 0.4.1
dad9a78 meta-initramfs: use bb.utils.contains() instead of base_contains()
aa72c9e meta-gnome: use bb.utils.contains() instead of base_contains()
0d7c615 meta-efl: use bb.utils.contains() instead of base_contains()
ab9f4d9 meta-multimedia: use bb.utils.contains() instead of base_contains()
f08b75f meta-xfce: use bb.utils.contains() instead of base_contains()
e5c807b meta-webserver: use bb.utils.contains() instead of base_contains()
21f10c1 meta-oe: use bb.utils.contains() instead of base_contains()
723b55f libubox: update to the latest git version for bug fixes
b188239 concurrencykit: update to version 0.5.1
2675ade bootchart: update to 1.17
08f7d59 libgee: update to the latest stable version (0.18.0)
819f73f log4cplus: update to version 1.2.0
3be4e86 libio-pty-perl: update to version 1.12
5d67ab6 libxml++: update to the latest stable version (2.38.1)
85c72f4 python-parted: update to version 3.10.7
d95712f mozjs: fix armeb builds
63606ed initramfs-{debug,kexecboot}-image: zero out the rootfs_extra_space in initramfs images
33fc545 gtest, gmock: allow building gtest-native and gmock-native
969cd47 crash: add cross package
ff70a60 Add simple-mtpfs recipe
834392b python-visitor: Add recipe for version 0.1.2
d3767d9 python-netaddr: Add recipe for version 0.7.18
5a20e87 python-dominate: Add recipe for version 2.2.0
71dcf41 flite: fix license issue.
7a7863b xcursorgen: fix License issue
40d7128 udisk2: fix build issue with missing depends
fb30db6 nodejs: update to 4.4.3
6475f14 apache2: update to 2.4.20
1eac35d libmodbus: add support for the libmodbus development release
9676ebb python-wtforms: Add recipe for version 2.0.2
49b3517 python-pam: Add recipe for version 1.8.2
4be7006 python-flask-wtf: Add recipe for version 0.12
3e4ecdd python-flask-sqlalchemy: Add recipe for version 2.1
381d498 python-flask-navigation: Add recipe for version 0.2.0
962e2ab python-flask-bootstrap: Add recipe for version 3.3.5.7
00d5837 python-flask-bcrypt: Add recipe for version 0.7.1
5a7f267 python-blinker: Add recipe for version 1.4
cb95c5e python-bcrypt: Add recipe for version 2.0.0
bfa6d1c umip: unblacklist and disable parallel make
bbb8373 nginx: update to 1.9.14
d436de8 llvm: correct fix for the multilib libdir
6336472 python-whoosh: update to 2.7.4
fdb2b66 python-decorator: update to 4.0.9
3fa8c30 python-dateutil: update to 2.5.2
4a90cbc python-cython: update to 0.24
ead0d3b krb5: add native and nativesdk extend
c073b9a ne10: use bb.debug for debug messages
54a18a0 libbonobo.inc: add libbonobo-bin package by lib_package class
d5e7b4b libhtml-parser-perl: update to 3.72
591cd39 libextutils-installpaths-perl: update to 0.011
edb883e libextutils-config-perl: update to 0.008
4c6da8a libencode-perl: update to 2.83
caeea00 libdbi-perl: update to 1.634
fa4bbb8 libdbd-sqlite-perl: update to 1.50
6a7fed1 libcurses-perl: update to 1.34
547fe92 libcrypt-openssl-random-perl: update to 0.11
2a42fba libclass-method-modifiers-perl: update to 2.11
4f6ba02 libcapture-tiny-perl: update to 0.36
ba5f235 adduser: update to 3.114
cc6b324 libtinyxml2: update 2.2.0 -> 3.0.0
536d146 gnome-themes: fix icon-name-mapping not found
c4358e7 fcgi: update SRC_URI to match new path to fcgi-2.4.0.tar.gz archive
9ece354 openbox: add run time dependency on openbox-theme-clearlooks
7321fe2 nodejs: update to 4.4.2
3dfea34 vpnc: stage vpnc-script
eb4ce40 openconnect: add recipe
388adb9 ctdb: drop duplicated DESCRIPTION
6914b91 ctdb: rdepend on procps
d1a8f14 ctdb: disable the service by default
ee61bec iscsitarget: resolve build error with linux kernel 4.3 and above
a9d1b61 c-ares: Add package to networking
60c1f6c lldpd: Update to version 0.9.2
12e31ce samba: add volatile file to support readonly rootfs
237ade5 dnsmasq: get systemd only working again
4caeb00 libtalloc: Update to latest stable
b20f3b1 libtdb: Update to latest stable
59b17c8 libtevent: Update to latest stable
37c158f libldb: Update to latest stable
70bde9a samba: Update to latest stable
ab62c74 cyrus-sasl: Drop unneeded group addition
REVERT: 247b126 Revert "leptonica: add PACAKGECONFIG for openjpeg"
REVERT: ff38c70 python-cryptography: fix compile issue with openssl 1.0.2h
REVERT: 107e624 nbd: fix LIC_FILES_CHKSUM
REVERT: f76ad6c znc: fix QA issue and remove from blacklist
REVERT: 9199968 netcf: fix mishandling of gnulib submodule causing build fail
REVERT: 3cec94a autotools-bootstrap: make bootstrap package specific.
REVERT: 761a686 wireshark: Fix new QA Error
REVERT: 88a4748 curlpp: fix recipe
REVERT: e00ad20 upower: fix WARNING
REVERT: d2077f0 libwnck: fix WARNING
REVERT: 84fdde3 acpitests: Fix license issue
REVERT: 947e7f1 libnice, farsight2: unblacklist as libnice's nice.pc issue fixed.
REVERT: f797b79 wvstreams: fixing segfault with new gcc optimizations
REVERT: 84f69f3 packagegroup-tools-bluetooth: Selects the tools appropriate for the version of bluez being used.
REVERT: e341fa0 lmbench: avoid gcc optimize-away multiplication
REVERT: 1726e71 leptonica: add PACAKGECONFIG for openjpeg
REVERT: ea71aa8 poppler: add --std=c++11 to fix build with Qt 5.7
REVERT: 0e06305 llvm3.3: Disable auto -dbg packages
REVERT: ebe5fb2 pidgin: use pkg-config instead of hardcoded paths or python-config
REVERT: 4a5b269 pidgin: add PACKAGECONFIGs
REVERT: 6bcf20d pidgin: Update to 2.10.12
REVERT: 085dcdc toybox: Remove out-of-date patch
REVERT: 7743d7e rrdtool: fix do_configure failure on some hosts
REVERT: 305329d python-pyparsing: modify build to correctly use setuptools rather than distutils
REVERT: 33874df opencv: Fix metapkg dependencies for opencv-java and opencv-locales
REVERT: 25b22fb packagegroup-tools-bluetooth.bb: Selects the tools appropriate for the version of bluez being used.
REVERT: d4b1497 glmark2: wl_surface should be destoryed after destroying wl_window
REVERT: 4ee8ab7 fluidsynth: set correct portaudio packageconfig dependency
REVERT: 87488dc xfce-polkit: fix warning not able to copy license
REVERT: c9b3f9f meta-xfce: add intltool-native to DEPENDS
REVERT: 76f7c9d sox: dep on ffmpeg, not libav
REVERT: 5e2bb87 syslog-ng.inc: fix prerm script & class includes
REVERT: 9f34a85 sblim-sfcb: add missing dependency on unzip-native
REVERT: e2764e6 fbida: use separate builddir
REVERT: a1b71fe squid: CVE-2016-3947
REVERT: d824682 rp-pppoe: Fix rootfs creation errors
REVERT: 6812a4a openconnect: add missing dependencies
REVERT: 959b617 proftpd: CVE-2016-3125
REVERT: 2ae294d dovecot: fix QA issue and remove from blacklist
REVERT: ea52766 net-snmp: enable ipv6 support
REVERT: 2092396 ntp: Security fixes via update to 4.2.8p7
REVERT: fd1e5ea mozjs: fix configure host contamination
REVERT: ebb31a9 mariadb: Fix rootfs creation errors
REVERT: 852b40f wayland-fits: update, get out of PNBLACKLIST
REVERT: 8a1c490 hwdata: add new recipe
REVERT: d4cb722 rsnapshot: use ${bindir} as rsync location
REVERT: 2463098 mozjs_17.0.0.bb: Fix do_srpm error
REVERT: de2fe0d krb5-CVE-2016-3119.patch
REVERT: 470ab81 xfce4-weather-plugin: update to 0.8.7
REVERT: 01bf016 xfce4-whiskermenu-plugin: update to 1.5.3
REVERT: 51ad2f8 poppler: update to 0.4.1
REVERT: fe8fbf1 meta-initramfs: use bb.utils.contains() instead of base_contains()
REVERT: 2e3d033 meta-gnome: use bb.utils.contains() instead of base_contains()
REVERT: 33837ef meta-efl: use bb.utils.contains() instead of base_contains()
REVERT: d336edb meta-multimedia: use bb.utils.contains() instead of base_contains()
REVERT: 09ae3b6 meta-xfce: use bb.utils.contains() instead of base_contains()
REVERT: 9078b0d meta-webserver: use bb.utils.contains() instead of base_contains()
REVERT: cf18193 meta-oe: use bb.utils.contains() instead of base_contains()
REVERT: 0e6cc19 libubox: update to the latest git version for bug fixes
REVERT: 9f1c8ee concurrencykit: update to version 0.5.1
REVERT: fb946ee bootchart: update to 1.17
REVERT: 49d4df3 libgee: update to the latest stable version (0.18.0)
REVERT: 7166c0a log4cplus: update to version 1.2.0
REVERT: 0791add libio-pty-perl: update to version 1.12
REVERT: 9b956d2 libxml++: update to the latest stable version (2.38.1)
REVERT: 526a602 python-parted: update to version 3.10.7
REVERT: cd0fe0f mozjs: fix armeb builds
REVERT: 4d94318 initramfs-{debug,kexecboot}-image: zero out the rootfs_extra_space in initramfs images
REVERT: 146c382 gtest, gmock: allow building gtest-native and gmock-native
REVERT: 19284f3 crash: add cross package
REVERT: 70a46ba Add simple-mtpfs recipe
REVERT: a34566c python-visitor: Add recipe for version 0.1.2
REVERT: 4bc8f37 python-netaddr: Add recipe for version 0.7.18
REVERT: 07a6eeb python-dominate: Add recipe for version 2.2.0
REVERT: b58d78f flite: fix license issue.
REVERT: 9f8053b xcursorgen: fix License issue
REVERT: f98090c udisk2: fix build issue with missing depends
REVERT: d6a6190 nodejs: update to 4.4.3
REVERT: c9f8cc3 apache2: update to 2.4.20
REVERT: 8b15907 libmodbus: add support for the libmodbus development release
REVERT: 7a0519d python-wtforms: Add recipe for version 2.0.2
REVERT: 44aa637 python-pam: Add recipe for version 1.8.2
REVERT: 3e88e5e python-flask-wtf: Add recipe for version 0.12
REVERT: 9b1377a python-flask-sqlalchemy: Add recipe for version 2.1
REVERT: 8c69a06 python-flask-navigation: Add recipe for version 0.2.0
REVERT: 80279a3 python-flask-bootstrap: Add recipe for version 3.3.5.7
REVERT: a68a27c python-flask-bcrypt: Add recipe for version 0.7.1
REVERT: b72a23a python-blinker: Add recipe for version 1.4
REVERT: fc3b141 python-bcrypt: Add recipe for version 2.0.0
REVERT: 93aa4aa umip: unblacklist and disable parallel make
REVERT: bf34b1e nginx: update to 1.9.14
REVERT: 4fe750a llvm: correct fix for the multilib libdir
REVERT: b7cbd44 python-whoosh: update to 2.7.4
REVERT: 607e275 python-decorator: update to 4.0.9
REVERT: 2d50716 python-dateutil: update to 2.5.2
REVERT: 18872d2 python-cython: update to 0.24
REVERT: da664f7 krb5: add native and nativesdk extend
REVERT: e317d95 ne10: use bb.debug for debug messages
REVERT: 0d28aba libbonobo.inc: add libbonobo-bin package by lib_package class
REVERT: 1db7299 libhtml-parser-perl: update to 3.72
REVERT: e9d95a5 libextutils-installpaths-perl: update to 0.011
REVERT: 224dad6 libextutils-config-perl: update to 0.008
REVERT: f9156de libencode-perl: update to 2.83
REVERT: 26be6da libdbi-perl: update to 1.634
REVERT: ebf03b9 libdbd-sqlite-perl: update to 1.50
REVERT: 1e04c8b libcurses-perl: update to 1.34
REVERT: aedee46 libcrypt-openssl-random-perl: update to 0.11
REVERT: 5acf9a1 libclass-method-modifiers-perl: update to 2.11
REVERT: 32d95f3 libcapture-tiny-perl: update to 0.36
REVERT: c8f9b9c adduser: update to 3.114
REVERT: d4cde5c libtinyxml2: update 2.2.0 -> 3.0.0
REVERT: d34fc2a gnome-themes: fix icon-name-mapping not found
REVERT: c8ec1be fcgi: update SRC_URI to match new path to fcgi-2.4.0.tar.gz archive
REVERT: 37c75b3 openbox: add run time dependency on openbox-theme-clearlooks
REVERT: 88b739e nodejs: update to 4.4.2
REVERT: 3c76d0a vpnc: stage vpnc-script
REVERT: 51717e1 openconnect: add recipe
REVERT: afaf3c2 c-ares: Add package to networking
REVERT: cb87e40 samba: remove dependency on ctdb
REVERT: d73f12b samba: fix paths in sysv initscript
REVERT: d5baf78 samba: fix QA warnings.
REVERT: e123d76 ctdb: drop duplicated DESCRIPTION
REVERT: 7290932 ctdb: rdepend on procps
REVERT: dc0bc56 ctdb: disable the service by default
REVERT: 37c8e1f iscsitarget: resolve build error with linux kernel 4.3 and above
REVERT: eba63b3 lldpd: Update to version 0.9.2
REVERT: d7c6dc8 samba: add volatile file to support readonly rootfs
REVERT: 72a2f2b libtalloc: Update to latest stable
REVERT: 2aad141 libtdb: Update to latest stable
REVERT: 8176853 libtevent: Update to latest stable
REVERT: b325cea libldb: Update to latest stable
REVERT: 825cf15 samba: Update to latest stable
REVERT: 5aa6f37 dnsmasq: get systemd only working again
REVERT: abd1795 cyrus-sasl: Drop unneeded group addition
REVERT: 156b381 README: update maintainers list for krogoth
Change-Id: Id1c465d3fe39327bf35a475756b103eab8a90a02
git-subtree-dir: import-layers/meta-openembedded
git-subtree-split: 1efa5d623bc64659b57389e50be2568b1355d5f7
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'import-layers/meta-openembedded/meta-webserver')
26 files changed, 5387 insertions, 469 deletions
diff --git a/import-layers/meta-openembedded/meta-webserver/README b/import-layers/meta-openembedded/meta-webserver/README index e8422794b..1a63dcc6e 100644 --- a/import-layers/meta-openembedded/meta-webserver/README +++ b/import-layers/meta-openembedded/meta-webserver/README @@ -13,14 +13,14 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git subdirectory: meta -branch: krogoth +branch: morty revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-oe.git subdirectory: meta-oe -branch: krogoth +branch: morty revision: HEAD @@ -50,15 +50,14 @@ Notes Maintenance ----------- -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-systemd][krogoth]' in the subject' -When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-systemd][krogoth][PATCH' +Send patches / pull requests to openembedded-devel@lists.openembedded.org +with '[meta-webserver][morty]' in the subject. - -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster <akuster808@gmail.com> + License ------- diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.20.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb index 9932d1286..b227f191d 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.20.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.23.bb @@ -15,8 +15,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ S = "${WORKDIR}/httpd-${PV}" LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" -SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8" -SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da" +SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688" +SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb index 81151d1a4..96f21dde4 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.23.bb @@ -23,8 +23,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=dbff5a2b542fa58854455bf1a0b94b83" -SRC_URI[md5sum] = "3ff4f00ee051cf5d5304b47b1bc418b8" -SRC_URI[sha256sum] = "0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da" +SRC_URI[md5sum] = "04f19c60e810c028f5240a062668a688" +SRC_URI[sha256sum] = "0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58" S = "${WORKDIR}/httpd-${PV}" @@ -80,13 +80,14 @@ do_install_append() { # Ensure configuration file pulls in conf.d and modules.d printf "\nIncludeOptional ${sysconfdir}/${BPN}/conf.d/*.conf" >> ${D}/${sysconfdir}/${BPN}/httpd.conf + printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.load" >> ${D}/${sysconfdir}/${BPN}/httpd.conf printf "\nIncludeOptional ${sysconfdir}/${BPN}/modules.d/*.conf\n\n" >> ${D}/${sysconfdir}/${BPN}/httpd.conf # match with that is in init script printf "\nPidFile /run/httpd.pid" >> ${D}/${sysconfdir}/${BPN}/httpd.conf # Set 'ServerName' to fix error messages when restart apache service sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ fi @@ -116,7 +117,7 @@ apache_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${sbindir}/ install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir}/ sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${TARGET_PREFIX}libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs + sed -i 's!my $libtool = .*!my $libtool = "${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb index 5287ea42c..82fbb771e 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb @@ -19,10 +19,11 @@ SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a inherit autotools pkgconfig binconfig update-rc.d systemd -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," EXTRA_OECONF = "--disable-static \ --disable-nls \ diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init index 47fc0877a..7427fcb90 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/files/hiawatha-init @@ -19,6 +19,7 @@ OPTS="" case "$1" in start) echo -n "Starting $DESC: " + mkdir -p /var/log/hiawatha &> /dev/null start-stop-daemon --start -x "$DAEMON" -- $OPTS echo "$NAME." ;; diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb index 706217479..7b6ab2636 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.3.bb @@ -10,8 +10,8 @@ SRC_URI = "http://hiawatha-webserver.org/files/${BP}.tar.gz \ file://hiawatha-init \ file://hiawatha.service " -SRC_URI[md5sum] = "a77f044634884c4cc5d21dab44e822a3" -SRC_URI[sha256sum] = "5d9cdec51c618bb3efab747030e593d9bd49dfaf3236254c8e0cb60715716dbf" +SRC_URI[md5sum] = "31567dfc18d435bd419be279f7970019" +SRC_URI[sha256sum] = "99d185fb16bb1ab706724494d3cac86464f1485ed4b0fff09a192eca6da5ff8e" INITSCRIPT_NAME = "hiawatha" INITSCRIPT_PARAMS = "defaults 70" @@ -33,10 +33,7 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ -DCMAKE_INSTALL_SBINDIR=${sbindir} \ -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ -DCMAKE_INSTALL_LIBDIR=${libdir} \ - -DLOG_DIR=/var/log/hiawatha \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha " + -DCMAKE_INSTALL_FULL_LOCALSTATEDIR=${localstatedir}" do_install_append() { # Copy over init script and sed in the correct sbin path @@ -53,7 +50,7 @@ do_install_append() { install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system fi - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" "${D}${localstatedir}/run" } CONFFILES_${PN} = " \ @@ -63,3 +60,5 @@ CONFFILES_${PN} = " \ ${sysconfdir}/hiawatha/mimetype.conf \ ${sysconfdir}/hiawatha/php-fcgi.conf \ " + +FILES_${PN}-dev = "${libdir}/hiawatha/*${SOLIBSDEV}" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch index 46792ba06..5e96644aa 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx-cross.patch @@ -6,7 +6,7 @@ Upstream-Status: Pending diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature --- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 +++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 -@@ -48,12 +48,20 @@ +@@ -49,12 +49,20 @@ if [ -x $NGX_AUTOTEST ]; then @@ -29,7 +29,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ngx_found=yes if test -n "$ngx_feature_name"; then -@@ -67,17 +75,27 @@ +@@ -68,17 +75,27 @@ value) # /bin/sh is used to intercept "Killed" or "Abort trap" messages @@ -61,7 +61,7 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature else echo " found but is not working" fi -@@ -85,7 +103,7 @@ +@@ -86,7 +105,7 @@ bug) # /bin/sh is used to intercept "Killed" or "Abort trap" messages @@ -73,8 +73,8 @@ diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options --- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 +++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 -@@ -289,6 +289,18 @@ - --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;; +@@ -353,6 +353,18 @@ + --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; + # cross compile support @@ -92,7 +92,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options *) echo "$0: error: invalid option \"$option\"" exit 1 -@@ -434,6 +446,17 @@ +@@ -533,6 +445,17 @@ --with-debug enable debug logging @@ -110,7 +110,7 @@ diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options END exit 1 -@@ -455,6 +478,8 @@ +@@ -554,6 +577,8 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then NGX_WINE=$WINE @@ -137,14 +137,14 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof #include <sys/types.h> #include <sys/time.h> -@@ -33,20 +36,20 @@ +@@ -33,15 +36,16 @@ END -ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ - -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" + ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" ++ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" + eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" @@ -153,20 +153,13 @@ diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof -if [ -x $NGX_AUTOTEST ]; then - ngx_size=`$NGX_AUTOTEST` - echo " $ngx_size bytes" --fi + if [ -x $NGX_AUTOTEST ]; then -+ ngx_size=`$NGX_AUTOTEST` -+ echo " $ngx_size bytes" ++ ngx_size=`$NGX_AUTOTEST` ++ echo " $ngx_size bytes" + fi + fi --rm -rf $NGX_AUTOTEST* -- -+ rm -rf $NGX_AUTOTEST* -+fi - - case $ngx_size in - 4) diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix --- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 +++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service index 9926a4b9d..ce9906171 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/files/nginx.service @@ -3,10 +3,9 @@ Description=Nginx Server After=network.target [Service] Type=forking -PIDFile=@SYSCONFDIR@/nginx/run/nginx.pid -ExecStartPre=@BASEBINDIR@/mkdir -p @LOCALSTATEDIR@/log/nginx -ExecStart=@SYSCONFDIR@/init.d/nginx start -ExecStop=@SYSCONFDIR@/init.d/nginx stop +PIDFile=/run/nginx/nginx.pid +ExecStart=@SBINDIR@/nginx +ExecStop=@SBINDIR@/nginx -s stop +ExecReload=@SBINDIR@/nginx -s reload [Install] WantedBy=multi-user.target - diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx-1.9.14/nginx-cross.patch b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx-1.9.14/nginx-cross.patch deleted file mode 100644 index 5e96644aa..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx-1.9.14/nginx-cross.patch +++ /dev/null @@ -1,211 +0,0 @@ -We do not have capability to run binaries when cross compiling - -Upstream-Status: Pending - - -diff -uraN nginx-1.0.11.orig/auto/feature nginx-1.0.11/auto/feature ---- nginx-1.0.11.orig/auto/feature 2011-05-11 06:50:19.000000000 -0500 -+++ nginx-1.0.11/auto/feature 2011-12-27 13:56:42.323370040 -0600 -@@ -49,12 +49,20 @@ - - if [ -x $NGX_AUTOTEST ]; then - -+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then -+ NGX_AUTOTEST_EXEC="true" -+ NGX_FOUND_MSG=" (not tested, cross compiling)" -+ else -+ NGX_AUTOTEST_EXEC="$NGX_AUTOTEST" -+ NGX_FOUND_MSG="" -+ fi -+ - case "$ngx_feature_run" in - - yes) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found$NGX_FOUND_MSG" - ngx_found=yes - - if test -n "$ngx_feature_name"; then -@@ -68,17 +75,27 @@ - - value) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found$NGX_FOUND_MSG" - ngx_found=yes - -- cat << END >> $NGX_AUTO_CONFIG_H -+ if [ ".$NGX_CROSS_COMPILE" = ".yes" ]; then -+ cat << END >> $NGX_AUTO_CONFIG_H - - #ifndef $ngx_feature_name --#define $ngx_feature_name `$NGX_AUTOTEST` -+#define $ngx_feature_name $(eval "echo \$NGX_WITH_${ngx_feature_name}") - #endif - - END -+ else -+ cat << END >> $NGX_AUTO_CONFIG_H -+ -+#ifndef $ngx_feature_name -+#define $ngx_feature_name `$NGX_AUTOTEST_EXEC` -+#endif -+ -+END -+ fi - else - echo " found but is not working" - fi -@@ -86,7 +105,7 @@ - - bug) - # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -+ if /bin/sh -c $NGX_AUTOTEST_EXEC >> $NGX_AUTOCONF_ERR 2>&1; then - echo " not found" - - else -diff -uraN nginx-1.0.11.orig/auto/options nginx-1.0.11/auto/options ---- nginx-1.0.11.orig/auto/options 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/options 2011-12-27 13:56:42.323370040 -0600 -@@ -353,6 +353,18 @@ - --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; - --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; - -+ # cross compile support -+ --with-int=*) NGX_WITH_INT="$value" ;; -+ --with-long=*) NGX_WITH_LONG="$value" ;; -+ --with-long-long=*) NGX_WITH_LONG_LONG="$value" ;; -+ --with-ptr-size=*) NGX_WITH_PTR_SIZE="$value" ;; -+ --with-sig-atomic-t=*) NGX_WITH_SIG_ATOMIC_T="$value" ;; -+ --with-size-t=*) NGX_WITH_SIZE_T="$value" ;; -+ --with-off-t=*) NGX_WITH_OFF_T="$value" ;; -+ --with-time-t=*) NGX_WITH_TIME_T="$value" ;; -+ --with-sys-nerr=*) NGX_WITH_NGX_SYS_NERR="$value" ;; -+ --with-endian=*) NGX_WITH_ENDIAN="$value" ;; -+ - *) - echo "$0: error: invalid option \"$option\"" - exit 1 -@@ -533,6 +445,17 @@ - - --with-debug enable debug logging - -+ --with-int=VALUE force int size -+ --with-long=VALUE force long size -+ --with-long-long=VALUE force long long size -+ --with-ptr-size=VALUE force pointer size -+ --with-sig-atomic-t=VALUE force sig_atomic_t size -+ --with-size-t=VALUE force size_t size -+ --with-off-t=VALUE force off_t size -+ --with-time-t=VALUE force time_t size -+ --with-sys-nerr=VALUE force sys_nerr value -+ --with-endian=VALUE force system endianess -+ - END - - exit 1 -@@ -554,6 +577,8 @@ - - if [ ".$NGX_PLATFORM" = ".win32" ]; then - NGX_WINE=$WINE -+elif [ ! -z "$NGX_PLATFORM" ]; then -+ NGX_CROSS_COMPILE="yes" - fi - - -diff -uraN nginx-1.0.11.orig/auto/types/sizeof nginx-1.0.11/auto/types/sizeof ---- nginx-1.0.11.orig/auto/types/sizeof 2006-06-28 11:00:26.000000000 -0500 -+++ nginx-1.0.11/auto/types/sizeof 2011-12-27 13:56:42.323370040 -0600 -@@ -12,9 +12,12 @@ - - END - --ngx_size= -+ngx_size=$(eval "echo \$NGX_WITH_${ngx_param}") - --cat << END > $NGX_AUTOTEST.c -+if [ ".$ngx_size" != "." ]; then -+ echo " $ngx_size bytes" -+else -+ cat << END > $NGX_AUTOTEST.c - - #include <sys/types.h> - #include <sys/time.h> -@@ -33,15 +36,16 @@ - END - - --ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -+ ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" - --eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" -+ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" - - --if [ -x $NGX_AUTOTEST ]; then -- ngx_size=`$NGX_AUTOTEST` -- echo " $ngx_size bytes" -+ if [ -x $NGX_AUTOTEST ]; then -+ ngx_size=`$NGX_AUTOTEST` -+ echo " $ngx_size bytes" -+ fi - fi - - -diff -uraN nginx-1.0.11.orig/auto/unix nginx-1.0.11/auto/unix ---- nginx-1.0.11.orig/auto/unix 2011-12-14 07:34:16.000000000 -0600 -+++ nginx-1.0.11/auto/unix 2011-12-27 13:56:42.327370060 -0600 -@@ -393,13 +393,13 @@ - - # C types - --ngx_type="int"; . auto/types/sizeof -+ngx_type="int"; ngx_param="INT"; . auto/types/sizeof - --ngx_type="long"; . auto/types/sizeof -+ngx_type="long"; ngx_param="LONG"; . auto/types/sizeof - --ngx_type="long long"; . auto/types/sizeof -+ngx_type="long long"; ngx_param="LONG_LONG"; . auto/types/sizeof - --ngx_type="void *"; . auto/types/sizeof; ngx_ptr_size=$ngx_size -+ngx_type="void *"; ngx_param="PTR_SIZE"; . auto/types/sizeof; ngx_ptr_size=$ngx_size - ngx_param=NGX_PTR_SIZE; ngx_value=$ngx_size; . auto/types/value - - -@@ -416,7 +416,7 @@ - - ngx_type="uint64_t"; ngx_types="u_int64_t"; . auto/types/typedef - --ngx_type="sig_atomic_t"; ngx_types="int"; . auto/types/typedef -+ngx_type="sig_atomic_t"; ngx_param="SIG_ATOMIC_T"; ngx_types="int"; . auto/types/typedef - . auto/types/sizeof - ngx_param=NGX_SIG_ATOMIC_T_SIZE; ngx_value=$ngx_size; . auto/types/value - -@@ -432,15 +432,15 @@ - - . auto/endianess - --ngx_type="size_t"; . auto/types/sizeof -+ngx_type="size_t"; ngx_param="SIZE_T"; . auto/types/sizeof - ngx_param=NGX_MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value - ngx_param=NGX_SIZE_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - --ngx_type="off_t"; . auto/types/sizeof -+ngx_type="off_t"; ngx_param="OFF_T"; . auto/types/sizeof - ngx_param=NGX_MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value - ngx_param=NGX_OFF_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - --ngx_type="time_t"; . auto/types/sizeof -+ngx_type="time_t"; ngx_param="TIME_T"; . auto/types/sizeof - ngx_param=NGX_TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value - ngx_param=NGX_TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value - diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index ebf926a20..36f2ac6d7 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -12,12 +12,12 @@ SECTION = "net" DEPENDS = "libpcre gzip openssl" SRC_URI = " \ - http://nginx.org/download/nginx-${PV}.tar.gz \ - file://nginx-cross.patch \ - file://nginx.conf \ - file://nginx.init \ - file://nginx-volatile.conf \ - file://nginx.service \ + http://nginx.org/download/nginx-${PV}.tar.gz \ + file://nginx-cross.patch \ + file://nginx.conf \ + file://nginx.init \ + file://nginx-volatile.conf \ + file://nginx.service \ " inherit update-rc.d useradd @@ -31,99 +31,109 @@ NGINX_USER ?= "www" EXTRA_OECONF = "" DISABLE_STATIC = "" +PACKAGECONFIG[http2] = "--with-http_v2_module,," + do_configure () { - if [ "${SITEINFO_BITS}" = "64" ]; then - PTRSIZE=8 - else - PTRSIZE=4 - fi - - echo $CFLAGS - echo $LDFLAGS - - ./configure \ - --crossbuild=Linux:${TUNE_ARCH} \ - --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - --with-int=4 \ - --with-long=${PTRSIZE} \ - --with-long-long=8 \ - --with-ptr-size=${PTRSIZE} \ - --with-sig-atomic-t=${PTRSIZE} \ - --with-size-t=${PTRSIZE} \ - --with-off-t=${PTRSIZE} \ - --with-time-t=${PTRSIZE} \ - --with-sys-nerr=132 \ - --conf-path=${sysconfdir}/nginx/nginx.conf \ - --http-log-path=${localstatedir}/log/nginx/access.log \ - --error-log-path=${localstatedir}/log/nginx/error.log \ - --pid-path=/run/nginx/nginx.pid \ - --prefix=${prefix} \ - --with-http_ssl_module \ - --with-http_gzip_static_module \ - ${EXTRA_OECONF} + if [ "${SITEINFO_BITS}" = "64" ]; then + PTRSIZE=8 + else + PTRSIZE=4 + fi + + echo $CFLAGS + echo $LDFLAGS + + # Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH + echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf + + ./configure \ + --crossbuild=Linux:${TUNE_ARCH} \ + --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-int=4 \ + --with-long=${PTRSIZE} \ + --with-long-long=8 \ + --with-ptr-size=${PTRSIZE} \ + --with-sig-atomic-t=${PTRSIZE} \ + --with-size-t=${PTRSIZE} \ + --with-off-t=${PTRSIZE} \ + --with-time-t=${PTRSIZE} \ + --with-sys-nerr=132 \ + --conf-path=${sysconfdir}/nginx/nginx.conf \ + --http-log-path=${localstatedir}/log/nginx/access.log \ + --error-log-path=${localstatedir}/log/nginx/error.log \ + --pid-path=/run/nginx/nginx.pid \ + --prefix=${prefix} \ + --with-http_ssl_module \ + --with-http_gzip_static_module \ + ${EXTRA_OECONF} } do_install () { - oe_runmake 'DESTDIR=${D}' install - rm -fr ${D}${localstatedir}/run ${D}/run - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/${BPN} - - - -" \ - > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - install -d ${D}${sysconfdir}/${BPN} - ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run - install -d ${D}${NGINX_WWWDIR} - mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ - chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx - sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx - sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx - - install -d ${D}${sysconfdir}/nginx - install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf - sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf - install -d ${D}${sysconfdir}/nginx/sites-enabled - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx - sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - -e 's,@BASEBINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/nginx.service - fi + oe_runmake 'DESTDIR=${D}' install + rm -fr ${D}${localstatedir}/run ${D}/run + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d /run/${BPN} - - - -" \ + > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + echo "d /${localstatedir}/log/${BPN} 0755 root root -" \ + >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + install -d ${D}${sysconfdir}/${BPN} + ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run + install -d ${D}${NGINX_WWWDIR} + mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ + chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} + + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx + sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx + sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx + + install -d ${D}${sysconfdir}/nginx + install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf + sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf + install -d ${D}${sysconfdir}/nginx/sites-enabled + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx + sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/default/volatiles/99_nginx + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/nginx.service ${D}${systemd_unitdir}/system/ + sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SBINDIR@,${sbindir},g' \ + ${D}${systemd_unitdir}/system/nginx.service + fi } pkg_postinst_${PN} () { - if [ -z "$D" ]; then - if type systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi - fi + if [ -z "$D" ]; then + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi + fi } -FILES_${PN} += "${localstatedir}/ \ - ${systemd_unitdir}/system/nginx.service \ - " - -CONFFILES_${PN} = "${sysconfdir}/nginx/nginx.conf \ - ${sysconfdir}/nginx/fastcgi.conf\ - ${sysconfdir}/nginx/fastcgi_params \ - ${sysconfdir}/nginx/koi-utf \ - ${sysconfdir}/nginx/koi-win \ - ${sysconfdir}/nginx/mime.types \ - ${sysconfdir}/nginx/scgi_params \ - ${sysconfdir}/nginx/uwsgi_params \ - ${sysconfdir}/nginx/win-utf \ +FILES_${PN} += " \ + ${localstatedir}/ \ + ${systemd_unitdir}/system/nginx.service \ +" + +CONFFILES_${PN} = " \ + ${sysconfdir}/nginx/nginx.conf \ + ${sysconfdir}/nginx/fastcgi.conf \ + ${sysconfdir}/nginx/fastcgi_params \ + ${sysconfdir}/nginx/koi-utf \ + ${sysconfdir}/nginx/koi-win \ + ${sysconfdir}/nginx/mime.types \ + ${sysconfdir}/nginx/scgi_params \ + ${sysconfdir}/nginx/uwsgi_params \ + ${sysconfdir}/nginx/win-utf \ " INITSCRIPT_NAME = "nginx" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb new file mode 100644 index 000000000..c5392c766 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.10.1.bb @@ -0,0 +1,6 @@ +require nginx.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "088292d9caf6059ef328aa7dda332e44" +SRC_URI[sha256sum] = "1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb new file mode 100644 index 000000000..ae05c963b --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.11.5.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.10.x branch is the current stable branch, the recommended default +# 1.11.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" + +SRC_URI[md5sum] = "db43f2b19746f6f47401c3afc3924dc6" +SRC_URI[sha256sum] = "223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb deleted file mode 100644 index 089f547e8..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.8.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -require nginx.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3845852aedfa8d6d7765f55d06cc3ebd" - -SRC_URI[md5sum] = "2e91695074dbdfbf1bcec0ada9fda462" -SRC_URI[sha256sum] = "8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb deleted file mode 100644 index 585c52ce0..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.9.14.bb +++ /dev/null @@ -1,12 +0,0 @@ -require nginx.inc - -# 1.9.x is the current mainline branches containing all new features -# 1.8.x branch is the current stable branch, the recommended default -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=0bb58ed0dfd4f5dbece3b52aba79f023" - -SRC_URI[md5sum] = "a25818039f34b5d54b017d44c76321c4" -SRC_URI[sha256sum] = "2b4893076d28e6b4384bba8c4fdebfca6de6f8f68ec48a1ca94b9b855ff457d2" - -DISABLE_STATIC = "" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch index 7cf011b1c..8cd468235 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/files/0001-GNUmakefile-add-possibility-to-override-variables.patch @@ -91,7 +91,9 @@ diff --git a/src/nhttpd/GNUmakefile b/src/nhttpd/GNUmakefile index f6d12de..9524911 100644 --- a/src/nhttpd/GNUmakefile +++ b/src/nhttpd/GNUmakefile -@@ -1,18 +1,18 @@ +@@ -1,20 +1,20 @@ + # $nostromo: GNUmakefile,v 1.6 2016/04/12 19:02:06 hacki Exp $ + -CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c +CFLAGS := -O2 -pipe -Wall -Wstrict-prototypes -c @@ -120,14 +122,16 @@ diff --git a/src/tools/GNUmakefile b/src/tools/GNUmakefile index 15bea61..663ddb5 100644 --- a/src/tools/GNUmakefile +++ b/src/tools/GNUmakefile -@@ -1,11 +1,11 @@ +@@ -1,13 +1,13 @@ + # $nostromo: GNUmakefile,v 1.3 2016/04/12 19:02:58 hacki Exp $ + -CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c -+CCFLAGS := -O2 -pipe -Wall -Werror -Wstrict-prototypes ++CFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes crypt: crypt.o -- cc -o crypt crypt.o -lcrypt +- cc -L../libbsd -o crypt crypt.o -lcrypt -lbsd - strip crypt -+ $(CC) $(CFLAGS) -o crypt crypt.o -lcrypt ++ $(CC) $(CFLAGS) -L../libbsd -o crypt crypt.o -lcrypt -lbsd +# $(STRIP) crypt crypt.o: crypt.c diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb index 562ecd004..5493c12b3 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb @@ -1,7 +1,7 @@ SUMMARY = "A simple, fast and secure HTTP server" HOMEPAGE = "http://www.nazgul.ch/dev_nostromo.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=e5ec3fa723b29b7d59d205afd8d36938" +LIC_FILES_CHKSUM = "file://src/nhttpd/main.c;beginline=2;endline=14;md5=0bb3711a867b9704d3bfabcf5529b64e" SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ file://0001-GNUmakefile-add-possibility-to-override-variables.patch \ @@ -11,14 +11,14 @@ SRC_URI = "http://www.nazgul.ch/dev/${BPN}-${PV}.tar.gz \ file://nostromo \ " -SRC_URI[md5sum] = "dc6cfd6b5aae04c370c7f818fa7bde55" -SRC_URI[sha256sum] = "5f62578285e02449406b46cf06a7888fe3dc4a90bedf58cc18523bad62f6b914" +SRC_URI[md5sum] = "27aa241d78ff78920354c3e03a5026ea" +SRC_URI[sha256sum] = "541494ecfeafec58c0876ccc90cc23b06e0144f6f42029af44c7cdb1f411e8eb" TARGET_CC_ARCH += "${LDFLAGS}" -DEPENDS = "openssl" +DEPENDS = "openssl groff-native" -inherit update-rc.d useradd +inherit update-rc.d INITSCRIPT_NAME = "nostromo" INITSCRIPT_PARAMS = "defaults 70" @@ -27,11 +27,6 @@ do_compile() { oe_runmake } -# we need user/group www-data to exist when we install -# -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system -g www-data www-data" - do_install() { install -d ${D}/${sbindir} install -m 0755 src/nhttpd/nhttpd ${D}/${sbindir}/nhttpd diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.0.bb index 703492167..efa533a7d 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.0.bb @@ -9,8 +9,8 @@ SRC_URI = "http://opensource.dyc.edu/pub/sthttpd/sthttpd-${PV}.tar.gz \ file://thttpd.conf \ file://init" -SRC_URI[md5sum] = "e645a85a97d3cb883011a35bc2211815" -SRC_URI[sha256sum] = "78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b1eaddb" +SRC_URI[md5sum] = "f7dd2d506dc5fad2ad8794b1800d2634" +SRC_URI[sha256sum] = "97d660a881331e93818e872ce11536f461105d70a18dfc5de5895851c4b2afdb" S = "${WORKDIR}/sthttpd-${PV}" @@ -18,7 +18,14 @@ inherit autotools update-rc.d systemd SRV_DIR ?= "${servicedir}/www" -EXTRA_OEMAKE += "'WEBDIR=${SRV_DIR}'" +# Note that `${sbindir}/makeweb' is installed setgid to this group, +# but ${SRV_DIR} is not installed chgrp'd to the group by default. +WEBGROUP ?= "www-data" + +do_configure_prepend () { + export WEBDIR=${SRV_DIR} + export WEBGROUP=${WEBGROUP} +} do_install_append () { install -d ${D}${sysconfdir}/init.d diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/Port-content-spoofing-fix-CVE-2015-7873.patch b/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/Port-content-spoofing-fix-CVE-2015-7873.patch deleted file mode 100644 index 1e6bcbda5..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/Port-content-spoofing-fix-CVE-2015-7873.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ae7eae1cc88cbdf2d27a6f10f097ef731823689e Mon Sep 17 00:00:00 2001 -From: Wenzong Fan <wenzong.fan@windriver.com> -Date: Sat, 14 Nov 2015 02:01:54 -0500 -Subject: [PATCH] Port content spoofing fix - -Backport upstream commit for fixing CVE-2015-7873: - https://github.com/phpmyadmin/phpmyadmin/commit/cd097656758f981f80fb9029c7d6b4294582b706 - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> ---- - ChangeLog | 4 ++++ - url.php | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 4cb6708..96936c8 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -107,6 +107,10 @@ phpMyAdmin - ChangeLog - - issue #11448 Clarify doc about the MemoryLimit directive - - issue #11489 Cannot copy a database under certain conditions - -+4.4.15.1 (2015-10-23) -+- issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system -+- issue [security] Content spoofing on url.php -+ - 4.4.15.0 (not yet released) - - issue #11411 Undefined "replace" function on numeric scalar - - issue #11421 Stored-proc / routine - broken parameter parsing -diff --git a/url.php b/url.php -index eec78a5..9c4c884 100644 ---- a/url.php -+++ b/url.php -@@ -32,6 +32,7 @@ if (! PMA_isValid($_REQUEST['url']) - } - </script>"; - // Display redirecting msg on screen. -- printf(__('Taking you to %s.'), htmlspecialchars($_REQUEST['url'])); -+ // Do not display the value of $_REQUEST['url'] to avoid showing injected content -+ echo __('Taking you to the target site.'); - } - die(); --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/phpmyadmin-CVE-2015-8669.patch b/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/phpmyadmin-CVE-2015-8669.patch deleted file mode 100644 index 65fff6455..000000000 --- a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/phpmyadmin-CVE-2015-8669.patch +++ /dev/null @@ -1,18 +0,0 @@ -[Security] Path disclosure, see PMASA-2015-6 - -Upstream-Status: Bacport - -Signed-off-by: Marc Delisle <marc@infomarc.info> - -diff -Nur phpMyAdmin-4.5.0.2-all-languages.orig/libraries/config/messages.inc.php phpMyAdmin-4.5.0.2-all-languages/libraries/config/messages.inc.php ---- phpMyAdmin-4.5.0.2-all-languages.orig/libraries/config/messages.inc.php 2016-01-20 15:11:15.410106888 +0800 -+++ phpMyAdmin-4.5.0.2-all-languages/libraries/config/messages.inc.php 2016-01-20 15:14:05.758108076 +0800 -@@ -11,7 +11,7 @@ - */ - - if (!function_exists('__')) { -- PMA_fatalError('Bad invocation!'); -+ exit(); - } - - $strConfigAllowArbitraryServer_desc = __( diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.5.0.2.bb b/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.6.3.bb index ac321857b..61872ae09 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.5.0.2.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.6.3.bb @@ -5,14 +5,12 @@ LICENSE = "GPLv2 & LGPLv3 & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c" -SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/4.5.0.2/phpMyAdmin-4.5.0.2-all-languages.tar.xz \ - file://Port-content-spoofing-fix-CVE-2015-7873.patch \ +SRC_URI = "https://files.phpmyadmin.net/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \ file://apache.conf \ - file://phpmyadmin-CVE-2015-8669.patch \ " -SRC_URI[md5sum] = "2d08d2fcc8f70f88a11a14723e3ca275" -SRC_URI[sha256sum] = "d2e90ea486d90b4ebe5eb02d7ad349ad2916c12a8981f98553395ef78d22a8ec" +SRC_URI[md5sum] = "53c7a6a577d10de04a5dd21a05018542" +SRC_URI[sha256sum] = "943bad38a95f21bb015bdb78c9c067e0ea7510c1b35d4b8e757cb89c413e3bac" S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch new file mode 100644 index 000000000..d5529a2a6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-Correct-Timeout-issue.patch @@ -0,0 +1,19 @@ +diff --git a/plugins.d/charts.d.plugin b/plugins.d/charts.d.plugin +index 40c0356..bca57b3 100755 +--- a/plugins.d/charts.d.plugin ++++ b/plugins.d/charts.d.plugin +@@ -184,10 +184,10 @@ fi + # timeout command we use, providing a function that + # can emulate the timeout command we need: + # > timeout SECONDS command ... +-if [ $check_for_timeout -eq 1 ] +- then +- require_cmd timeout || exit 1 +-fi ++#if [ $check_for_timeout -eq 1 ] ++# then ++# require_cmd timeout || exit 1 ++#fi + + # ----------------------------------------------------------------------------- + # internal checks diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf new file mode 100644 index 000000000..a2b3999c6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.conf @@ -0,0 +1,5083 @@ +# NetData Configuration +# You can uncomment and change any of the options below. +# The value shown in the commented settings, is the default value. + +# global netdata configuration + +[global] + debug flags = 0x10000000 + hostname = netdata + history = 86400 + config directory = @@sysconfdir/netdata + plugins directory = @@libdir/netdata/plugins.d + web files directory = @@datadir/netdata/web + cache directory = /var/cache/netdata + log directory = /var/log/netdata + # host access prefix = + # memory deduplication (ksm) = yes + # debug log = /var/log/netdata/debug.log + # error log = /var/log/netdata/error.log + # access log = /var/log/netdata/access.log + # memory mode = save + # update every = 1 + # pthread stack size = 8388608 + # run as user = netdata + # web files owner = netdata + # http port listen backlog = 100 + # port = 19999 + # ip version = any + # disconnect idle web clients after seconds = 60 + # enable web responses gzip compression = yes + +[plugins] + # tc = yes + tc = no + # idlejitter = yes + proc = yes + checks = no + plugins directory = @@libdir/netdata/plugins.d + nable running new plugins = yes + check for new plugins every = 60 + charts.d = yes + sma_webbox = no + apps = yes + node.d = yes + + +# per plugin configuration + +[plugin:proc:/proc/net/dev] + # filename to monitor = /proc/net/dev + # enable new interfaces detected at runtime = on demand + # enable ifb interfaces = no + # bandwidth for all interfaces = on demand + # packets for all interfaces = on demand + # errors for all interfaces = on demand + # drops for all interfaces = on demand + # fifo for all interfaces = on demand + # compressed packets for all interfaces = on demand + # frames, collisions, carrier counters for all interfaces = on demand + +[plugin:proc] + # /proc/net/dev = yes + # /proc/diskstats = yes + # /proc/net/snmp = yes + # /proc/net/snmp6 = yes + # /proc/net/netstat = yes + # /proc/net/stat/conntrack = yes + # /proc/net/ip_vs/stats = yes + # /proc/stat = yes + # /proc/meminfo = yes + # /proc/vmstat = yes + # /proc/net/rpc/nfsd = yes + # /proc/sys/kernel/random/entropy_avail = yes + # /proc/interrupts = yes + # /proc/softirqs = yes + # /proc/loadavg = yes + # /sys/kernel/mm/ksm = yes + # netdata server resources = yes + +[plugin:tc] + # script to run to get tc values = /usr/lib/netdata/netdata/plugins.d/tc-qos-helper.sh + # enable new interfaces detected at runtime = yes + # qos for eth1-ifb = yes + # cleanup unused classes every = 60 + # qos for eth0 = yes + # qos for eth1 = yes + # qos for eth0-ifb = yes + +[plugin:charts.d] + # update every = 1 + # command options = + +[plugin:apps] + # update every = 1 + # command options = + +[plugin:idlejitter] + # loop time in ms = 20 + +[plugin:proc:/proc/interrupts] + # interrupts per core = yes + # filename to monitor = /proc/interrupts + +[plugin:proc:/proc/sys/kernel/random/entropy_avail] + # filename to monitor = /proc/sys/kernel/random/entropy_avail + +[plugin:proc:/proc/diskstats] + # enable new disks detected at runtime = on demand + # bandwidth for all disks = on demand + # operations for all disks = on demand + # merged operations for all disks = on demand + # i/o time for all disks = on demand + # queued operations for all disks = on demand + # utilization percentage for all disks = on demand + # backlog for all disks = on demand + # filename to monitor = /proc/diskstats + # path to get h/w sector size = /sys/block/%s/queue/hw_sector_size + +[plugin:proc:/proc/net/snmp] + # ipv4 packets = yes + # ipv4 fragments sent = yes + # ipv4 fragments assembly = yes + # ipv4 errors = yes + # ipv4 TCP connections = yes + # ipv4 TCP packets = yes + # ipv4 TCP errors = yes + # ipv4 TCP handshake issues = yes + # ipv4 UDP packets = yes + # ipv4 UDP errors = yes + # filename to monitor = /proc/net/snmp + +[plugin:proc:/proc/net/netstat] + # bandwidth = on demand + # input errors = on demand + # multicast bandwidth = on demand + # broadcast bandwidth = on demand + # multicast packets = on demand + # broadcast packets = on demand + # filename to monitor = /proc/net/netstat + +[plugin:proc:/proc/net/stat/nf_conntrack] + # netfilter connections = yes + # netfilter new connections = yes + # netfilter connection changes = yes + # netfilter connection expectations = yes + # netfilter connection searches = yes + # netfilter errors = yes + # filename to monitor = /proc/net/stat/nf_conntrack + +[plugin:proc:/proc/net/ip_vs_stats] + # IPVS bandwidth = yes + # IPVS connections = yes + # IPVS packets = yes + # filename to monitor = /proc/net/ip_vs_stats + +[plugin:proc:/proc/stat] + # cpu utilization = yes + # per cpu core utilization = yes + # cpu interrupts = yes + # context switches = yes + # processes started = yes + # processes running = yes + # filename to monitor = /proc/stat + +[plugin:proc:/proc/meminfo] + # system ram = yes + # system swap = yes + # hardware corrupted ECC = on demand + # committed memory = yes + # writeback memory = yes + # kernel memory = yes + # slab memory = yes + # filename to monitor = /proc/meminfo + +[plugin:proc:/proc/vmstat] + # swap i/o = yes + # disk i/o = yes + # memory page faults = yes + # filename to monitor = /proc/vmstat + +[plugin:proc:/proc/net/rpc/nfsd] + # filename to monitor = /proc/net/rpc/nfsd + # read cache = yes + # file handles = yes + # I/O = yes + # threads = yes + # read ahead = yes + # network = yes + # rpc = yes + # NFS v2 procedures = yes + # NFS v3 procedures = yes + # NFS v4 procedures = yes + # NFS v4 operations = yes + +[plugin:proc:/proc/net/dev:lo] + # enabled = no + +[plugin:proc:/proc/net/dev:fireqos_monitor] + # enabled = no + +[plugin:sma_webbox] + # update every = 1 + # command options = + +[plugin:node.d] + # update every = 1 + # command options = + +[plugin:proc:/sys/kernel/mm/ksm] + # /sys/kernel/mm/ksm/pages_shared = /sys/kernel/mm/ksm/pages_shared + # /sys/kernel/mm/ksm/pages_sharing = /sys/kernel/mm/ksm/pages_sharing + # /sys/kernel/mm/ksm/pages_unshared = /sys/kernel/mm/ksm/pages_unshared + # /sys/kernel/mm/ksm/pages_volatile = /sys/kernel/mm/ksm/pages_volatile + # /sys/kernel/mm/ksm/pages_to_scan = /sys/kernel/mm/ksm/pages_to_scan + +[plugin:proc:/proc/loadavg] + # filename to monitor = /proc/loadavg + # enable load average = yes + # enable total processes = yes + +[plugin:proc:/proc/softirqs] + # interrupts per core = yes + # filename to monitor = /proc/softirqs + +[plugin:proc:/proc/net/dev:eth1-ifb] + # enabled = no + +[plugin:proc:/proc/net/dev:eth0] + # enabled = on demand + # bandwidth = on demand + # packets = on demand + # errors = on demand + # drops = on demand + # fifo = on demand + # compressed = on demand + # events = on demand + +[plugin:proc:/proc/net/dev:eth1] + # enabled = on demand + # bandwidth = on demand + # packets = on demand + # errors = on demand + # drops = on demand + # fifo = on demand + # compressed = on demand + # events = on demand + +[plugin:proc:/proc/net/dev:eth0-ifb] + # enabled = no + +[plugin:proc:/proc/diskstats:fd0] + # enabled = no + +[plugin:proc:/proc/diskstats:sda] + # enabled = on demand + # bandwidth = on demand + # operations = on demand + # merged operations = on demand + # i/o time = on demand + queued operations = yes + # utilization percentage = on demand + # backlog = on demand + +[plugin:proc:/proc/diskstats:sda1] + # enabled = no + +[plugin:proc:/proc/diskstats:sda2] + # enabled = no + +[plugin:proc:/proc/diskstats:sda5] + # enabled = no + +[plugin:proc:/proc/diskstats:sr0] + # enabled = no + +[plugin:proc:/proc/net/snmp6] + # ipv6 packets = on demand + # ipv6 fragments sent = on demand + # ipv6 fragments assembly = on demand + # ipv6 errors = on demand + # ipv6 UDP packets = on demand + # ipv6 UDP errors = on demand + # ipv6 UDPlite packets = on demand + # ipv6 UDPlite errors = on demand + # bandwidth = on demand + # multicast bandwidth = on demand + # broadcast bandwidth = on demand + # multicast packets = on demand + # icmp = on demand + # icmp redirects = on demand + # icmp errors = on demand + # icmp echos = on demand + # icmp group membership = on demand + # icmp router = on demand + # icmp neighbor = on demand + # icmp mldv2 = on demand + # icmp types = on demand + # ect = on demand + # filename to monitor = /proc/net/snmp6 + + +# per chart configuration + +[system.idlejitter] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/system.idlejitter + # chart type = line + # type = system + # family = processes + # context = system.idlejitter + # units = microseconds lost/s + # priority = 9999 + # gap when lost iterations above = 1 + # name = system.idlejitter + # title = CPU Idle Jitter (system.idlejitter) + # dim jitter name = jitter + # dim jitter algorithm = absolute + # dim jitter multiplier = 1 + # dim jitter divisor = 1 + +[system.interrupts] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/system.interrupts + # chart type = stacked + # type = system + # family = interrupts + # context = system.interrupts + # units = interrupts/s + # priority = 1000 + # gap when lost iterations above = 1 + # name = system.interrupts + # title = System interrupts (system.interrupts) + # dim 0 name = timer_0 + # dim 0 algorithm = incremental + # dim 0 multiplier = 1 + # dim 0 divisor = 1 + # dim 1 name = i8042_1 + # dim 1 algorithm = incremental + # dim 1 multiplier = 1 + # dim 1 divisor = 1 + # dim 6 name = floppy_6 + # dim 6 algorithm = incremental + # dim 6 multiplier = 1 + # dim 6 divisor = 1 + # dim 8 name = rtc0_8 + # dim 8 algorithm = incremental + # dim 8 multiplier = 1 + # dim 8 divisor = 1 + # dim 9 name = acpi_9 + # dim 9 algorithm = incremental + # dim 9 multiplier = 1 + # dim 9 divisor = 1 + # dim 12 name = i8042_12 + # dim 12 algorithm = incremental + # dim 12 multiplier = 1 + # dim 12 divisor = 1 + # dim 14 name = ata_piix_14 + # dim 14 algorithm = incremental + # dim 14 multiplier = 1 + # dim 14 divisor = 1 + # dim 15 name = ata_piix_15 + # dim 15 algorithm = incremental + # dim 15 multiplier = 1 + # dim 15 divisor = 1 + # dim NMI name = NMI + # dim NMI algorithm = incremental + # dim NMI multiplier = 1 + # dim NMI divisor = 1 + # dim LOC name = LOC + # dim LOC algorithm = incremental + # dim LOC multiplier = 1 + # dim LOC divisor = 1 + # dim SPU name = SPU + # dim SPU algorithm = incremental + # dim SPU multiplier = 1 + # dim SPU divisor = 1 + # dim PMI name = PMI + # dim PMI algorithm = incremental + # dim PMI multiplier = 1 + # dim PMI divisor = 1 + # dim IWI name = IWI + # dim IWI algorithm = incremental + # dim IWI multiplier = 1 + # dim IWI divisor = 1 + # dim RTR name = RTR + # dim RTR algorithm = incremental + # dim RTR multiplier = 1 + # dim RTR divisor = 1 + # dim RES name = RES + # dim RES algorithm = incremental + # dim RES multiplier = 1 + # dim RES divisor = 1 + # dim CAL name = CAL + # dim CAL algorithm = incremental + # dim CAL multiplier = 1 + # dim CAL divisor = 1 + # dim TLB name = TLB + # dim TLB algorithm = incremental + # dim TLB multiplier = 1 + # dim TLB divisor = 1 + # dim TRM name = TRM + # dim TRM algorithm = incremental + # dim TRM multiplier = 1 + # dim TRM divisor = 1 + # dim THR name = THR + # dim THR algorithm = incremental + # dim THR multiplier = 1 + # dim THR divisor = 1 + # dim MCE name = MCE + # dim MCE algorithm = incremental + # dim MCE multiplier = 1 + # dim MCE divisor = 1 + # dim MCP name = MCP + # dim MCP algorithm = incremental + # dim MCP multiplier = 1 + # dim MCP divisor = 1 + # dim HYP name = HYP + # dim HYP algorithm = incremental + # dim HYP multiplier = 1 + # dim HYP divisor = 1 + # dim ERR name = ERR + # dim ERR algorithm = incremental + # dim ERR multiplier = 1 + # dim ERR divisor = 1 + # dim MIS name = MIS + # dim MIS algorithm = incremental + # dim MIS multiplier = 1 + # dim MIS divisor = 1 + +[system.entropy] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/system.entropy + # chart type = line + # type = system + # family = entropy + # context = system.entropy + # units = entropy + # priority = 1000 + # gap when lost iterations above = 1 + # name = system.entropy + # title = Available Entropy (system.entropy) + # dim entropy name = entropy + # dim entropy algorithm = absolute + # dim entropy multiplier = 1 + # dim entropy divisor = 1 + +[net.eth0] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/net.eth0 + # chart type = area + # type = net + # family = eth0 + # context = net.net + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = net.eth0 + # title = Bandwidth (net.eth0) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[net_packets.eth0] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/net_packets.eth0 + # chart type = line + # type = net_packets + # family = eth0 + # context = net.packets + # units = packets/s + # priority = 7001 + # gap when lost iterations above = 1 + # name = net_packets.eth0 + # title = Packets (net_packets.eth0) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + # dim multicast name = multicast + # dim multicast algorithm = incremental + # dim multicast multiplier = 1 + # dim multicast divisor = 1 + +[net_drops.eth0] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/net_drops.eth0 + # chart type = line + # type = net_drops + # family = eth0 + # context = net.drops + # units = drops/s + # priority = 7003 + # gap when lost iterations above = 1 + # name = net_drops.eth0 + # title = Interface Drops (net_drops.eth0) + # dim inbound name = inbound + # dim inbound algorithm = incremental + # dim inbound multiplier = 1 + # dim inbound divisor = 1 + # dim outbound name = outbound + # dim outbound algorithm = incremental + # dim outbound multiplier = -1 + # dim outbound divisor = 1 + +[net.eth1] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/net.eth1 + # chart type = area + # type = net + # family = eth1 + # context = net.net + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = net.eth1 + # title = Bandwidth (net.eth1) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[net_packets.eth1] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/net_packets.eth1 + # chart type = line + # type = net_packets + # family = eth1 + # context = net.packets + # units = packets/s + # priority = 7001 + # gap when lost iterations above = 1 + # name = net_packets.eth1 + # title = Packets (net_packets.eth1) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + # dim multicast name = multicast + # dim multicast algorithm = incremental + # dim multicast multiplier = 1 + # dim multicast divisor = 1 + +[disk.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk.sda + # chart type = area + # type = disk + # family = sda + # context = disk.io + # units = kilobytes/s + # priority = 2000 + # gap when lost iterations above = 1 + # name = disk.sda + # title = Disk I/O Bandwidth (disk.sda) + # dim reads name = reads + # dim reads algorithm = incremental + # dim reads multiplier = 512 + # dim reads divisor = 1024 + # dim writes name = writes + # dim writes algorithm = incremental + # dim writes multiplier = -512 + # dim writes divisor = 1024 + +[disk_ops.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_ops.sda + # chart type = line + # type = disk_ops + # family = sda + # context = disk.ops + # units = operations/s + # priority = 2001 + # gap when lost iterations above = 1 + # name = disk_ops.sda + # title = Disk Completed I/O Operations (disk_ops.sda) + # dim reads name = reads + # dim reads algorithm = incremental + # dim reads multiplier = 1 + # dim reads divisor = 1 + # dim writes name = writes + # dim writes algorithm = incremental + # dim writes multiplier = -1 + # dim writes divisor = 1 + +[disk_qops.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_qops.sda + # chart type = line + # type = disk_qops + # family = sda + # context = disk.qops + # units = operations + # priority = 2002 + # gap when lost iterations above = 1 + # name = disk_qops.sda + # title = Disk Current I/O Operations (disk_qops.sda) + # dim operations name = operations + # dim operations algorithm = absolute + # dim operations multiplier = 1 + # dim operations divisor = 1 + +[disk_backlog.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_backlog.sda + # chart type = area + # type = disk_backlog + # family = sda + # context = disk.backlog + # units = backlog (ms) + # priority = 2003 + # gap when lost iterations above = 1 + # name = disk_backlog.sda + # title = Disk Backlog (disk_backlog.sda) + # dim backlog name = backlog + # dim backlog algorithm = incremental + # dim backlog multiplier = 1 + # dim backlog divisor = 10 + +[disk_util.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_util.sda + # chart type = area + # type = disk_util + # family = sda + # context = disk.util + # units = % of time working + # priority = 2004 + # gap when lost iterations above = 1 + # name = disk_util.sda + # title = Disk Utilization Time (disk_util.sda) + # dim utilization name = utilization + # dim utilization algorithm = incremental + # dim utilization multiplier = 1 + # dim utilization divisor = 10 + +[disk_mops.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_mops.sda + # chart type = line + # type = disk_mops + # family = sda + # context = disk.mops + # units = merged operations/s + # priority = 2021 + # gap when lost iterations above = 1 + # name = disk_mops.sda + # title = Disk Merged Operations (disk_mops.sda) + # dim reads name = reads + # dim reads algorithm = incremental + # dim reads multiplier = 1 + # dim reads divisor = 1 + # dim writes name = writes + # dim writes algorithm = incremental + # dim writes multiplier = -1 + # dim writes divisor = 1 + +[disk_iotime.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_iotime.sda + # chart type = line + # type = disk_iotime + # family = sda + # context = disk.iotime + # units = milliseconds/s + # priority = 2022 + # gap when lost iterations above = 1 + # name = disk_iotime.sda + # title = Disk Total I/O Time (disk_iotime.sda) + # dim reads name = reads + # dim reads algorithm = incremental + # dim reads multiplier = 1 + # dim reads divisor = 1 + # dim writes name = writes + # dim writes algorithm = incremental + # dim writes multiplier = -1 + # dim writes divisor = 1 + +[ipv4.packets] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/ipv4.packets + # chart type = line + # type = ipv4 + # family = packets + # context = ipv4.packets + # units = packets/s + # priority = 3000 + # gap when lost iterations above = 1 + # name = ipv4.packets + # title = IPv4 Packets (ipv4.packets) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + # dim forwarded name = forwarded + # dim forwarded algorithm = incremental + # dim forwarded multiplier = 1 + # dim forwarded divisor = 1 + +[ipv4.fragsout] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.fragsout + # chart type = line + # type = ipv4 + # family = fragments + # context = ipv4.fragsout + # units = packets/s + # priority = 3010 + # gap when lost iterations above = 1 + # name = ipv4.fragsout + # title = IPv4 Fragments Sent (ipv4.fragsout) + # dim ok name = ok + # dim ok algorithm = incremental + # dim ok multiplier = 1 + # dim ok divisor = 1 + # dim failed name = failed + # dim failed algorithm = incremental + # dim failed multiplier = -1 + # dim failed divisor = 1 + # dim all name = all + # dim all algorithm = incremental + # dim all multiplier = 1 + # dim all divisor = 1 + +[ipv4.fragsin] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.fragsin + # chart type = line + # type = ipv4 + # family = fragments + # context = ipv4.fragsin + # units = packets/s + # priority = 3011 + # gap when lost iterations above = 1 + # name = ipv4.fragsin + # title = IPv4 Fragments Reassembly (ipv4.fragsin) + # dim ok name = ok + # dim ok algorithm = incremental + # dim ok multiplier = 1 + # dim ok divisor = 1 + # dim failed name = failed + # dim failed algorithm = incremental + # dim failed multiplier = -1 + # dim failed divisor = 1 + # dim all name = all + # dim all algorithm = incremental + # dim all multiplier = 1 + # dim all divisor = 1 + +[ipv4.errors] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.errors + # chart type = line + # type = ipv4 + # family = errors + # context = ipv4.errors + # units = packets/s + # priority = 3002 + # gap when lost iterations above = 1 + # name = ipv4.errors + # title = IPv4 Errors (ipv4.errors) + # dim InDiscards name = InDiscards + # dim InDiscards algorithm = incremental + # dim InDiscards multiplier = 1 + # dim InDiscards divisor = 1 + # dim OutDiscards name = OutDiscards + # dim OutDiscards algorithm = incremental + # dim OutDiscards multiplier = -1 + # dim OutDiscards divisor = 1 + # dim InHdrErrors name = InHdrErrors + # dim InHdrErrors algorithm = incremental + # dim InHdrErrors multiplier = 1 + # dim InHdrErrors divisor = 1 + # dim InAddrErrors name = InAddrErrors + # dim InAddrErrors algorithm = incremental + # dim InAddrErrors multiplier = 1 + # dim InAddrErrors divisor = 1 + # dim InUnknownProtos name = InUnknownProtos + # dim InUnknownProtos algorithm = incremental + # dim InUnknownProtos multiplier = 1 + # dim InUnknownProtos divisor = 1 + # dim OutNoRoutes name = OutNoRoutes + # dim OutNoRoutes algorithm = incremental + # dim OutNoRoutes multiplier = -1 + # dim OutNoRoutes divisor = 1 + +[ipv4.tcpsock] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.tcpsock + # chart type = line + # type = ipv4 + # family = tcp + # context = ipv4.tcpsock + # units = active connections + # priority = 2500 + # gap when lost iterations above = 1 + # name = ipv4.tcpsock + # title = IPv4 TCP Connections (ipv4.tcpsock) + # dim connections name = connections + # dim connections algorithm = absolute + # dim connections multiplier = 1 + # dim connections divisor = 1 + +[ipv4.tcppackets] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.tcppackets + # chart type = line + # type = ipv4 + # family = tcp + # context = ipv4.tcppackets + # units = packets/s + # priority = 2600 + # gap when lost iterations above = 1 + # name = ipv4.tcppackets + # title = IPv4 TCP Packets (ipv4.tcppackets) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[ipv4.tcperrors] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.tcperrors + # chart type = line + # type = ipv4 + # family = tcp + # context = ipv4.tcperrors + # units = packets/s + # priority = 2700 + # gap when lost iterations above = 1 + # name = ipv4.tcperrors + # title = IPv4 TCP Errors (ipv4.tcperrors) + # dim InErrs name = InErrs + # dim InErrs algorithm = incremental + # dim InErrs multiplier = 1 + # dim InErrs divisor = 1 + # dim RetransSegs name = RetransSegs + # dim RetransSegs algorithm = incremental + # dim RetransSegs multiplier = -1 + # dim RetransSegs divisor = 1 + +[ipv4.tcphandshake] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.tcphandshake + # chart type = line + # type = ipv4 + # family = tcp + # context = ipv4.tcphandshake + # units = events/s + # priority = 2900 + # gap when lost iterations above = 1 + # name = ipv4.tcphandshake + # title = IPv4 TCP Handshake Issues (ipv4.tcphandshake) + # dim EstabResets name = EstabResets + # dim EstabResets algorithm = incremental + # dim EstabResets multiplier = 1 + # dim EstabResets divisor = 1 + # dim OutRsts name = OutRsts + # dim OutRsts algorithm = incremental + # dim OutRsts multiplier = -1 + # dim OutRsts divisor = 1 + # dim ActiveOpens name = ActiveOpens + # dim ActiveOpens algorithm = incremental + # dim ActiveOpens multiplier = 1 + # dim ActiveOpens divisor = 1 + # dim PassiveOpens name = PassiveOpens + # dim PassiveOpens algorithm = incremental + # dim PassiveOpens multiplier = 1 + # dim PassiveOpens divisor = 1 + # dim AttemptFails name = AttemptFails + # dim AttemptFails algorithm = incremental + # dim AttemptFails multiplier = 1 + # dim AttemptFails divisor = 1 + +[ipv4.udppackets] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.udppackets + # chart type = line + # type = ipv4 + # family = udp + # context = ipv4.udppackets + # units = packets/s + # priority = 2601 + # gap when lost iterations above = 1 + # name = ipv4.udppackets + # title = IPv4 UDP Packets (ipv4.udppackets) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[ipv4.udperrors] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.udperrors + # chart type = line + # type = ipv4 + # family = udp + # context = ipv4.udperrors + # units = events/s + # priority = 2701 + # gap when lost iterations above = 1 + # name = ipv4.udperrors + # title = IPv4 UDP Errors (ipv4.udperrors) + # dim RcvbufErrors name = RcvbufErrors + # dim RcvbufErrors algorithm = incremental + # dim RcvbufErrors multiplier = 1 + # dim RcvbufErrors divisor = 1 + # dim SndbufErrors name = SndbufErrors + # dim SndbufErrors algorithm = incremental + # dim SndbufErrors multiplier = -1 + # dim SndbufErrors divisor = 1 + # dim InErrors name = InErrors + # dim InErrors algorithm = incremental + # dim InErrors multiplier = 1 + # dim InErrors divisor = 1 + # dim NoPorts name = NoPorts + # dim NoPorts algorithm = incremental + # dim NoPorts multiplier = 1 + # dim NoPorts divisor = 1 + +[system.ipv4] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/system.ipv4 + # chart type = area + # type = system + # family = network + # context = system.ipv4 + # units = kilobits/s + # priority = 500 + # gap when lost iterations above = 1 + # name = system.ipv4 + # title = IPv4 Bandwidth (system.ipv4) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[ipv4.bcast] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.bcast + # chart type = area + # type = ipv4 + # family = broadcast + # context = ipv4.bcast + # units = kilobits/s + # priority = 8000 + # gap when lost iterations above = 1 + # name = ipv4.bcast + # title = IPv4 Broadcast Bandwidth (ipv4.bcast) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[ipv4.bcastpkts] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv4.bcastpkts + # chart type = line + # type = ipv4 + # family = broadcast + # context = ipv4.bcastpkts + # units = packets/s + # priority = 8500 + # gap when lost iterations above = 1 + # name = ipv4.bcastpkts + # title = IPv4 Broadcast Packets (ipv4.bcastpkts) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[system.cpu] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/system.cpu + # chart type = stacked + # type = system + # family = cpu + # context = system.cpu + # units = percentage + # priority = 100 + # gap when lost iterations above = 1 + # name = system.cpu + # title = Total CPU utilization (system.cpu) + # dim guest_nice name = guest_nice + # dim guest_nice algorithm = percentage-of-incremental-row + # dim guest_nice multiplier = 1 + # dim guest_nice divisor = 1 + # dim guest name = guest + # dim guest algorithm = percentage-of-incremental-row + # dim guest multiplier = 1 + # dim guest divisor = 1 + # dim steal name = steal + # dim steal algorithm = percentage-of-incremental-row + # dim steal multiplier = 1 + # dim steal divisor = 1 + # dim softirq name = softirq + # dim softirq algorithm = percentage-of-incremental-row + # dim softirq multiplier = 1 + # dim softirq divisor = 1 + # dim irq name = irq + # dim irq algorithm = percentage-of-incremental-row + # dim irq multiplier = 1 + # dim irq divisor = 1 + # dim user name = user + # dim user algorithm = percentage-of-incremental-row + # dim user multiplier = 1 + # dim user divisor = 1 + # dim system name = system + # dim system algorithm = percentage-of-incremental-row + # dim system multiplier = 1 + # dim system divisor = 1 + # dim nice name = nice + # dim nice algorithm = percentage-of-incremental-row + # dim nice multiplier = 1 + # dim nice divisor = 1 + # dim iowait name = iowait + # dim iowait algorithm = percentage-of-incremental-row + # dim iowait multiplier = 1 + # dim iowait divisor = 1 + # dim idle name = idle + # dim idle algorithm = percentage-of-incremental-row + # dim idle multiplier = 1 + # dim idle divisor = 1 + +[cpu.cpu0] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu0 + # chart type = stacked + # type = cpu + # family = utilization + # context = cpu.cpu + # units = percentage + # priority = 1000 + # gap when lost iterations above = 1 + # name = cpu.cpu0 + # title = Core utilization (cpu.cpu0) + # dim guest_nice name = guest_nice + # dim guest_nice algorithm = percentage-of-incremental-row + # dim guest_nice multiplier = 1 + # dim guest_nice divisor = 1 + # dim guest name = guest + # dim guest algorithm = percentage-of-incremental-row + # dim guest multiplier = 1 + # dim guest divisor = 1 + # dim steal name = steal + # dim steal algorithm = percentage-of-incremental-row + # dim steal multiplier = 1 + # dim steal divisor = 1 + # dim softirq name = softirq + # dim softirq algorithm = percentage-of-incremental-row + # dim softirq multiplier = 1 + # dim softirq divisor = 1 + # dim irq name = irq + # dim irq algorithm = percentage-of-incremental-row + # dim irq multiplier = 1 + # dim irq divisor = 1 + # dim user name = user + # dim user algorithm = percentage-of-incremental-row + # dim user multiplier = 1 + # dim user divisor = 1 + # dim system name = system + # dim system algorithm = percentage-of-incremental-row + # dim system multiplier = 1 + # dim system divisor = 1 + # dim nice name = nice + # dim nice algorithm = percentage-of-incremental-row + # dim nice multiplier = 1 + # dim nice divisor = 1 + # dim iowait name = iowait + # dim iowait algorithm = percentage-of-incremental-row + # dim iowait multiplier = 1 + # dim iowait divisor = 1 + # dim idle name = idle + # dim idle algorithm = percentage-of-incremental-row + # dim idle multiplier = 1 + # dim idle divisor = 1 + +[cpu.cpu1] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu1 + # chart type = stacked + # type = cpu + # family = utilization + # context = cpu.cpu + # units = percentage + # priority = 1000 + # gap when lost iterations above = 1 + # name = cpu.cpu1 + # title = Core utilization (cpu.cpu1) + # dim guest_nice name = guest_nice + # dim guest_nice algorithm = percentage-of-incremental-row + # dim guest_nice multiplier = 1 + # dim guest_nice divisor = 1 + # dim guest name = guest + # dim guest algorithm = percentage-of-incremental-row + # dim guest multiplier = 1 + # dim guest divisor = 1 + # dim steal name = steal + # dim steal algorithm = percentage-of-incremental-row + # dim steal multiplier = 1 + # dim steal divisor = 1 + # dim softirq name = softirq + # dim softirq algorithm = percentage-of-incremental-row + # dim softirq multiplier = 1 + # dim softirq divisor = 1 + # dim irq name = irq + # dim irq algorithm = percentage-of-incremental-row + # dim irq multiplier = 1 + # dim irq divisor = 1 + # dim user name = user + # dim user algorithm = percentage-of-incremental-row + # dim user multiplier = 1 + # dim user divisor = 1 + # dim system name = system + # dim system algorithm = percentage-of-incremental-row + # dim system multiplier = 1 + # dim system divisor = 1 + # dim nice name = nice + # dim nice algorithm = percentage-of-incremental-row + # dim nice multiplier = 1 + # dim nice divisor = 1 + # dim iowait name = iowait + # dim iowait algorithm = percentage-of-incremental-row + # dim iowait multiplier = 1 + # dim iowait divisor = 1 + # dim idle name = idle + # dim idle algorithm = percentage-of-incremental-row + # dim idle multiplier = 1 + # dim idle divisor = 1 + +[system.intr] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.intr + # chart type = line + # type = system + # family = interrupts + # context = system.intr + # units = interrupts/s + # priority = 900 + # gap when lost iterations above = 1 + # name = system.intr + # title = CPU Interrupts (system.intr) + # dim interrupts name = interrupts + # dim interrupts algorithm = incremental + # dim interrupts multiplier = 1 + # dim interrupts divisor = 1 + +[system.ctxt] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.ctxt + # chart type = line + # type = system + # family = processes + # context = system.ctxt + # units = context switches/s + # priority = 800 + # gap when lost iterations above = 1 + # name = system.ctxt + # title = CPU Context Switches (system.ctxt) + # dim switches name = switches + # dim switches algorithm = incremental + # dim switches multiplier = 1 + # dim switches divisor = 1 + +[system.forks] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.forks + # chart type = line + # type = system + # family = processes + # context = system.forks + # units = processes/s + # priority = 700 + # gap when lost iterations above = 1 + # name = system.forks + # title = Started Processes (system.forks) + # dim started name = started + # dim started algorithm = incremental + # dim started multiplier = 1 + # dim started divisor = 1 + +[system.processes] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.processes + # chart type = line + # type = system + # family = processes + # context = system.processes + # units = processes + # priority = 600 + # gap when lost iterations above = 1 + # name = system.processes + # title = System Processes (system.processes) + # dim running name = running + # dim running algorithm = absolute + # dim running multiplier = 1 + # dim running divisor = 1 + # dim blocked name = blocked + # dim blocked algorithm = absolute + # dim blocked multiplier = -1 + # dim blocked divisor = 1 + +[system.ram] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.ram + # chart type = stacked + # type = system + # family = ram + # context = system.ram + # units = MB + # priority = 200 + # gap when lost iterations above = 1 + # name = system.ram + # title = System RAM (system.ram) + # dim buffers name = buffers + # dim buffers algorithm = absolute + # dim buffers multiplier = 1 + # dim buffers divisor = 1024 + # dim used name = used + # dim used algorithm = absolute + # dim used multiplier = 1 + # dim used divisor = 1024 + # dim cached name = cached + # dim cached algorithm = absolute + # dim cached multiplier = 1 + # dim cached divisor = 1024 + # dim free name = free + # dim free algorithm = absolute + # dim free multiplier = 1 + # dim free divisor = 1024 + +[system.swap] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.swap + # chart type = stacked + # type = system + # family = swap + # context = system.swap + # units = MB + # priority = 201 + # gap when lost iterations above = 1 + # name = system.swap + # title = System Swap (system.swap) + # dim free name = free + # dim free algorithm = absolute + # dim free multiplier = 1 + # dim free divisor = 1024 + # dim used name = used + # dim used algorithm = absolute + # dim used multiplier = 1 + # dim used divisor = 1024 + +[mem.committed] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/mem.committed + # chart type = area + # type = mem + # family = system + # context = mem.committed + # units = MB + # priority = 5000 + # gap when lost iterations above = 1 + # name = mem.committed + # title = Committed (Allocated) Memory (mem.committed) + # dim Committed_AS name = Committed_AS + # dim Committed_AS algorithm = absolute + # dim Committed_AS multiplier = 1 + # dim Committed_AS divisor = 1024 + +[mem.writeback] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mem.writeback + # chart type = line + # type = mem + # family = kernel + # context = mem.writeback + # units = MB + # priority = 4000 + # gap when lost iterations above = 1 + # name = mem.writeback + # title = Writeback Memory (mem.writeback) + # dim Dirty name = Dirty + # dim Dirty algorithm = absolute + # dim Dirty multiplier = 1 + # dim Dirty divisor = 1024 + # dim Writeback name = Writeback + # dim Writeback algorithm = absolute + # dim Writeback multiplier = 1 + # dim Writeback divisor = 1024 + # dim FuseWriteback name = FuseWriteback + # dim FuseWriteback algorithm = absolute + # dim FuseWriteback multiplier = 1 + # dim FuseWriteback divisor = 1024 + # dim NfsWriteback name = NfsWriteback + # dim NfsWriteback algorithm = absolute + # dim NfsWriteback multiplier = 1 + # dim NfsWriteback divisor = 1024 + # dim Bounce name = Bounce + # dim Bounce algorithm = absolute + # dim Bounce multiplier = 1 + # dim Bounce divisor = 1024 + +[mem.kernel] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/mem.kernel + # chart type = stacked + # type = mem + # family = kernel + # context = mem.kernel + # units = MB + # priority = 6000 + # gap when lost iterations above = 1 + # name = mem.kernel + # title = Memory Used by Kernel (mem.kernel) + # dim Slab name = Slab + # dim Slab algorithm = absolute + # dim Slab multiplier = 1 + # dim Slab divisor = 1024 + # dim KernelStack name = KernelStack + # dim KernelStack algorithm = absolute + # dim KernelStack multiplier = 1 + # dim KernelStack divisor = 1024 + # dim PageTables name = PageTables + # dim PageTables algorithm = absolute + # dim PageTables multiplier = 1 + # dim PageTables divisor = 1024 + # dim VmallocUsed name = VmallocUsed + # dim VmallocUsed algorithm = absolute + # dim VmallocUsed multiplier = 1 + # dim VmallocUsed divisor = 1024 + +[mem.slab] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mem.slab + # chart type = stacked + # type = mem + # family = slab + # context = mem.slab + # units = MB + # priority = 6500 + # gap when lost iterations above = 1 + # name = mem.slab + # title = Reclaimable Kernel Memory (mem.slab) + # dim reclaimable name = reclaimable + # dim reclaimable algorithm = absolute + # dim reclaimable multiplier = 1 + # dim reclaimable divisor = 1024 + # dim unreclaimable name = unreclaimable + # dim unreclaimable algorithm = absolute + # dim unreclaimable multiplier = 1 + # dim unreclaimable divisor = 1024 + +[system.swapio] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/system.swapio + # chart type = area + # type = system + # family = swap + # context = system.swapio + # units = kilobytes/s + # priority = 250 + # gap when lost iterations above = 1 + # name = system.swapio + # title = Swap I/O (system.swapio) + # dim in name = in + # dim in algorithm = incremental + # dim in multiplier = 4096 + # dim in divisor = 1024 + # dim out name = out + # dim out algorithm = incremental + # dim out multiplier = -4096 + # dim out divisor = 1024 + +[system.io] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.io + # chart type = area + # type = system + # family = disk + # context = system.io + # units = kilobytes/s + # priority = 150 + # gap when lost iterations above = 1 + # name = system.io + # title = Disk I/O (system.io) + # dim in name = in + # dim in algorithm = incremental + # dim in multiplier = 1 + # dim in divisor = 1 + # dim out name = out + # dim out algorithm = incremental + # dim out multiplier = -1 + # dim out divisor = 1 + +[netdata.plugin_proc_cpu] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.plugin_proc_cpu + # chart type = stacked + # type = netdata + # family = proc.internal + # context = netdata.plugin_proc_cpu + # units = milliseconds/s + # priority = 131000 + # gap when lost iterations above = 1 + # name = netdata.plugin_proc_cpu + # title = NetData Proc Plugin CPU usage (netdata.plugin_proc_cpu) + # dim user name = user + # dim user algorithm = incremental + # dim user multiplier = 1 + # dim user divisor = 1000 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1000 + +[netdata.server_cpu] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.server_cpu + # chart type = stacked + # type = netdata + # family = netdata + # context = netdata.server_cpu + # units = milliseconds/s + # priority = 130000 + # gap when lost iterations above = 1 + # name = netdata.server_cpu + # title = NetData CPU usage (netdata.server_cpu) + # dim user name = user + # dim user algorithm = incremental + # dim user multiplier = 1 + # dim user divisor = 1000 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1000 + +[netdata.clients] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.clients + # chart type = line + # type = netdata + # family = netdata + # context = netdata.clients + # units = connected clients + # priority = 131000 + # gap when lost iterations above = 1 + # name = netdata.clients + # title = NetData Web Clients (netdata.clients) + # dim clients name = clients + # dim clients algorithm = absolute + # dim clients multiplier = 1 + # dim clients divisor = 1 + +[netdata.requests] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.requests + # chart type = line + # type = netdata + # family = netdata + # context = netdata.requests + # units = requests/s + # priority = 131100 + # gap when lost iterations above = 1 + # name = netdata.requests + # title = NetData Web Requests (netdata.requests) + # dim requests name = requests + # dim requests algorithm = incremental + # dim requests multiplier = 1 + # dim requests divisor = 1 + +[netdata.net] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.net + # chart type = area + # type = netdata + # family = netdata + # context = netdata.net + # units = kilobits/s + # priority = 131200 + # gap when lost iterations above = 1 + # name = netdata.net + # title = NetData Network Traffic (netdata.net) + # dim in name = in + # dim in algorithm = incremental + # dim in multiplier = 8 + # dim in divisor = 1024 + # dim out name = out + # dim out algorithm = incremental + # dim out multiplier = -8 + # dim out divisor = 1024 + +[apps.cpu] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.cpu + # chart type = stacked + # type = apps + # family = cpu + # context = apps.cpu + # units = cpu time % + # priority = 20001 + # gap when lost iterations above = 1 + # name = apps.cpu + # title = Apps CPU Time (200% = 2 cores) (apps.cpu) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 100 + # dim other divisor = 100 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 100 + # dim ksmd divisor = 100 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 100 + # dim system divisor = 100 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 100 + # dim netdata divisor = 100 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 100 + # dim kernel divisor = 100 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 100 + # dim cron divisor = 100 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 100 + # dim inetd divisor = 100 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 100 + # dim nms divisor = 100 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 100 + # dim log divisor = 100 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 100 + # dim ntp divisor = 100 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 100 + # dim named divisor = 100 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 100 + # dim ssh divisor = 100 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 100 + # dim nfs divisor = 100 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 100 + # dim nginx divisor = 100 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 100 + # dim postfix divisor = 100 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 100 + # dim mysql divisor = 100 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 100 + # dim rsync divisor = 100 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 100 + # dim compile divisor = 100 + +[apps.mem] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.mem + # chart type = stacked + # type = apps + # family = mem + # context = apps.mem + # units = MB + # priority = 20003 + # gap when lost iterations above = 1 + # name = apps.mem + # title = Apps Dedicated Memory (w/o shared) (apps.mem) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 4096 + # dim other divisor = 1048576 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 4096 + # dim ksmd divisor = 1048576 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 4096 + # dim system divisor = 1048576 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 4096 + # dim netdata divisor = 1048576 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 4096 + # dim kernel divisor = 1048576 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 4096 + # dim cron divisor = 1048576 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 4096 + # dim inetd divisor = 1048576 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 4096 + # dim nms divisor = 1048576 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 4096 + # dim log divisor = 1048576 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 4096 + # dim ntp divisor = 1048576 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 4096 + # dim named divisor = 1048576 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 4096 + # dim ssh divisor = 1048576 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 4096 + # dim nfs divisor = 1048576 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 4096 + # dim nginx divisor = 1048576 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 4096 + # dim postfix divisor = 1048576 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 4096 + # dim mysql divisor = 1048576 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 4096 + # dim rsync divisor = 1048576 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 4096 + # dim compile divisor = 1048576 + +[apps.threads] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.threads + # chart type = stacked + # type = apps + # family = processes + # context = apps.threads + # units = threads + # priority = 20005 + # gap when lost iterations above = 1 + # name = apps.threads + # title = Apps Threads (apps.threads) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.processes] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.processes + # chart type = stacked + # type = apps + # family = processes + # context = apps.processes + # units = processes + # priority = 20004 + # gap when lost iterations above = 1 + # name = apps.processes + # title = Apps Processes (apps.processes) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.cpu_user] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.cpu_user + # chart type = stacked + # type = apps + # family = cpu + # context = apps.cpu_user + # units = cpu time % + # priority = 20020 + # gap when lost iterations above = 1 + # name = apps.cpu_user + # title = Apps CPU User Time (200% = 2 cores) (apps.cpu_user) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 100 + # dim other divisor = 200 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 100 + # dim ksmd divisor = 200 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 100 + # dim system divisor = 200 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 100 + # dim netdata divisor = 200 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 100 + # dim kernel divisor = 200 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 100 + # dim cron divisor = 200 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 100 + # dim inetd divisor = 200 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 100 + # dim nms divisor = 200 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 100 + # dim log divisor = 200 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 100 + # dim ntp divisor = 200 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 100 + # dim named divisor = 200 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 100 + # dim ssh divisor = 200 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 100 + # dim nfs divisor = 200 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 100 + # dim nginx divisor = 200 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 100 + # dim postfix divisor = 200 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 100 + # dim mysql divisor = 200 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 100 + # dim rsync divisor = 200 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 100 + # dim compile divisor = 200 + +[apps.cpu_system] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.cpu_system + # chart type = stacked + # type = apps + # family = cpu + # context = apps.cpu_system + # units = cpu time % + # priority = 20021 + # gap when lost iterations above = 1 + # name = apps.cpu_system + # title = Apps CPU System Time (200% = 2 cores) (apps.cpu_system) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 100 + # dim other divisor = 200 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 100 + # dim ksmd divisor = 200 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 100 + # dim system divisor = 200 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 100 + # dim netdata divisor = 200 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 100 + # dim kernel divisor = 200 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 100 + # dim cron divisor = 200 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 100 + # dim inetd divisor = 200 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 100 + # dim nms divisor = 200 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 100 + # dim log divisor = 200 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 100 + # dim ntp divisor = 200 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 100 + # dim named divisor = 200 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 100 + # dim ssh divisor = 200 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 100 + # dim nfs divisor = 200 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 100 + # dim nginx divisor = 200 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 100 + # dim postfix divisor = 200 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 100 + # dim mysql divisor = 200 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 100 + # dim rsync divisor = 200 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 100 + # dim compile divisor = 200 + +[apps.major_faults] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.major_faults + # chart type = stacked + # type = apps + # family = swap + # context = apps.major_faults + # units = page faults/s + # priority = 20010 + # gap when lost iterations above = 1 + # name = apps.major_faults + # title = Apps Major Page Faults (swap read) (apps.major_faults) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.minor_faults] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/apps.minor_faults + # chart type = stacked + # type = apps + # family = mem + # context = apps.minor_faults + # units = page faults/s + # priority = 20011 + # gap when lost iterations above = 1 + # name = apps.minor_faults + # title = Apps Minor Page Faults (apps.minor_faults) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.lreads] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.lreads + # chart type = stacked + # type = apps + # family = disk + # context = apps.lreads + # units = kilobytes/s + # priority = 20042 + # gap when lost iterations above = 1 + # name = apps.lreads + # title = Apps Disk Logical Reads (apps.lreads) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1024 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1024 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1024 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1024 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1024 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1024 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1024 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1024 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1024 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1024 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1024 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1024 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1024 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1024 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1024 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1024 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1024 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1024 + +[apps.lwrites] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.lwrites + # chart type = stacked + # type = apps + # family = disk + # context = apps.lwrites + # units = kilobytes/s + # priority = 20042 + # gap when lost iterations above = 1 + # name = apps.lwrites + # title = Apps I/O Logical Writes (apps.lwrites) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1024 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1024 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1024 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1024 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1024 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1024 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1024 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1024 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1024 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1024 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1024 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1024 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1024 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1024 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1024 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1024 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1024 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1024 + +[apps.preads] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.preads + # chart type = stacked + # type = apps + # family = disk + # context = apps.preads + # units = kilobytes/s + # priority = 20002 + # gap when lost iterations above = 1 + # name = apps.preads + # title = Apps Disk Reads (apps.preads) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1024 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1024 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1024 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1024 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1024 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1024 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1024 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1024 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1024 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1024 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1024 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1024 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1024 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1024 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1024 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1024 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1024 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1024 + +[apps.pwrites] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.pwrites + # chart type = stacked + # type = apps + # family = disk + # context = apps.pwrites + # units = kilobytes/s + # priority = 20002 + # gap when lost iterations above = 1 + # name = apps.pwrites + # title = Apps Disk Writes (apps.pwrites) + # dim other name = other + # dim other algorithm = incremental + # dim other multiplier = 1 + # dim other divisor = 1024 + # dim ksmd name = ksmd + # dim ksmd algorithm = incremental + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1024 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1024 + # dim netdata name = netdata + # dim netdata algorithm = incremental + # dim netdata multiplier = 1 + # dim netdata divisor = 1024 + # dim kernel name = kernel + # dim kernel algorithm = incremental + # dim kernel multiplier = 1 + # dim kernel divisor = 1024 + # dim cron name = cron + # dim cron algorithm = incremental + # dim cron multiplier = 1 + # dim cron divisor = 1024 + # dim inetd name = inetd + # dim inetd algorithm = incremental + # dim inetd multiplier = 1 + # dim inetd divisor = 1024 + # dim nms name = nms + # dim nms algorithm = incremental + # dim nms multiplier = 1 + # dim nms divisor = 1024 + # dim log name = log + # dim log algorithm = incremental + # dim log multiplier = 1 + # dim log divisor = 1024 + # dim ntp name = ntp + # dim ntp algorithm = incremental + # dim ntp multiplier = 1 + # dim ntp divisor = 1024 + # dim named name = named + # dim named algorithm = incremental + # dim named multiplier = 1 + # dim named divisor = 1024 + # dim ssh name = ssh + # dim ssh algorithm = incremental + # dim ssh multiplier = 1 + # dim ssh divisor = 1024 + # dim nfs name = nfs + # dim nfs algorithm = incremental + # dim nfs multiplier = 1 + # dim nfs divisor = 1024 + # dim nginx name = nginx + # dim nginx algorithm = incremental + # dim nginx multiplier = 1 + # dim nginx divisor = 1024 + # dim postfix name = postfix + # dim postfix algorithm = incremental + # dim postfix multiplier = 1 + # dim postfix divisor = 1024 + # dim mysql name = mysql + # dim mysql algorithm = incremental + # dim mysql multiplier = 1 + # dim mysql divisor = 1024 + # dim rsync name = rsync + # dim rsync algorithm = incremental + # dim rsync multiplier = 1 + # dim rsync divisor = 1024 + # dim compile name = compile + # dim compile algorithm = incremental + # dim compile multiplier = 1 + # dim compile divisor = 1024 + +[apps.files] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.files + # chart type = stacked + # type = apps + # family = disk + # context = apps.files + # units = open files + # priority = 20050 + # gap when lost iterations above = 1 + # name = apps.files + # title = Apps Open Files (apps.files) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.sockets] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.sockets + # chart type = stacked + # type = apps + # family = net + # context = apps.sockets + # units = open sockets + # priority = 20051 + # gap when lost iterations above = 1 + # name = apps.sockets + # title = Apps Open Sockets (apps.sockets) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[apps.pipes] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/apps.pipes + # chart type = stacked + # type = apps + # family = processes + # context = apps.pipes + # units = open pipes + # priority = 20053 + # gap when lost iterations above = 1 + # name = apps.pipes + # title = Apps Pipes (apps.pipes) + # dim other name = other + # dim other algorithm = absolute + # dim other multiplier = 1 + # dim other divisor = 1 + # dim ksmd name = ksmd + # dim ksmd algorithm = absolute + # dim ksmd multiplier = 1 + # dim ksmd divisor = 1 + # dim system name = system + # dim system algorithm = absolute + # dim system multiplier = 1 + # dim system divisor = 1 + # dim netdata name = netdata + # dim netdata algorithm = absolute + # dim netdata multiplier = 1 + # dim netdata divisor = 1 + # dim kernel name = kernel + # dim kernel algorithm = absolute + # dim kernel multiplier = 1 + # dim kernel divisor = 1 + # dim cron name = cron + # dim cron algorithm = absolute + # dim cron multiplier = 1 + # dim cron divisor = 1 + # dim inetd name = inetd + # dim inetd algorithm = absolute + # dim inetd multiplier = 1 + # dim inetd divisor = 1 + # dim nms name = nms + # dim nms algorithm = absolute + # dim nms multiplier = 1 + # dim nms divisor = 1 + # dim log name = log + # dim log algorithm = absolute + # dim log multiplier = 1 + # dim log divisor = 1 + # dim ntp name = ntp + # dim ntp algorithm = absolute + # dim ntp multiplier = 1 + # dim ntp divisor = 1 + # dim named name = named + # dim named algorithm = absolute + # dim named multiplier = 1 + # dim named divisor = 1 + # dim ssh name = ssh + # dim ssh algorithm = absolute + # dim ssh multiplier = 1 + # dim ssh divisor = 1 + # dim nfs name = nfs + # dim nfs algorithm = absolute + # dim nfs multiplier = 1 + # dim nfs divisor = 1 + # dim nginx name = nginx + # dim nginx algorithm = absolute + # dim nginx multiplier = 1 + # dim nginx divisor = 1 + # dim postfix name = postfix + # dim postfix algorithm = absolute + # dim postfix multiplier = 1 + # dim postfix divisor = 1 + # dim mysql name = mysql + # dim mysql algorithm = absolute + # dim mysql multiplier = 1 + # dim mysql divisor = 1 + # dim rsync name = rsync + # dim rsync algorithm = absolute + # dim rsync multiplier = 1 + # dim rsync divisor = 1 + # dim compile name = compile + # dim compile algorithm = absolute + # dim compile multiplier = 1 + # dim compile divisor = 1 + +[netdata.apps_cpu] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/netdata.apps_cpu + # chart type = stacked + # type = netdata + # family = apps.plugin + # context = netdata.apps_cpu + # units = milliseconds/s + # priority = 140000 + # gap when lost iterations above = 1 + # name = netdata.apps_cpu + # title = Apps Plugin CPU (netdata.apps_cpu) + # dim user name = user + # dim user algorithm = incremental + # dim user multiplier = 1 + # dim user divisor = 1000 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1000 + +[netdata.apps_files] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.apps_files + # chart type = line + # type = netdata + # family = apps.plugin + # context = netdata.apps_files + # units = files/s + # priority = 140001 + # gap when lost iterations above = 1 + # name = netdata.apps_files + # title = Apps Plugin Files (netdata.apps_files) + # dim files name = files + # dim files algorithm = incremental + # dim files multiplier = 1 + # dim files divisor = 1 + # dim pids name = pids + # dim pids algorithm = absolute + # dim pids multiplier = 1 + # dim pids divisor = 1 + # dim fds name = fds + # dim fds algorithm = absolute + # dim fds multiplier = 1 + # dim fds divisor = 1 + # dim targets name = targets + # dim targets algorithm = absolute + # dim targets multiplier = 1 + # dim targets divisor = 1 + +[netdata.plugin_tc_cpu] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.plugin_tc_cpu + # chart type = stacked + # type = netdata + # family = tc.helper + # context = netdata.plugin_tc_cpu + # units = milliseconds/s + # priority = 135000 + # gap when lost iterations above = 1 + # name = netdata.plugin_tc_cpu + # title = NetData TC CPU usage (netdata.plugin_tc_cpu) + # dim user name = user + # dim user algorithm = incremental + # dim user multiplier = 1 + # dim user divisor = 1000 + # dim system name = system + # dim system algorithm = incremental + # dim system multiplier = 1 + # dim system divisor = 1000 + +[netdata.plugin_tc_time] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.plugin_tc_time + # chart type = area + # type = netdata + # family = tc.helper + # context = netdata.plugin_tc_time + # units = milliseconds/run + # priority = 135001 + # gap when lost iterations above = 1 + # name = netdata.plugin_tc_time + # title = NetData TC script execution (netdata.plugin_tc_time) + # dim run_time name = run time + # dim run_time algorithm = absolute + # dim run_time multiplier = 1 + # dim run_time divisor = 1 + +[example.random] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/example.random + # chart type = stacked + # type = example + # family = random + # context = random + # units = % of random numbers + # priority = 150000 + # gap when lost iterations above = 1 + # name = example.random + # title = Random Numbers Stacked Chart (example.random) + # dim random1 name = random1 + # dim random1 algorithm = percentage-of-absolute-row + # dim random1 multiplier = 1 + # dim random1 divisor = 1 + # dim random2 name = random2 + # dim random2 algorithm = percentage-of-absolute-row + # dim random2 multiplier = 1 + # dim random2 divisor = 1 + # dim random3 name = random3 + # dim random3 algorithm = percentage-of-absolute-row + # dim random3 multiplier = 1 + # dim random3 divisor = 1 + +[postfix.qemails] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/postfix.qemails + # chart type = line + # type = postfix + # family = queue + # context = postfix.queued.emails + # units = emails + # priority = 60001 + # gap when lost iterations above = 1 + # name = postfix.qemails + # title = Postfix Queue Emails (postfix.qemails) + # dim emails name = emails + # dim emails algorithm = absolute + # dim emails multiplier = 1 + # dim emails divisor = 1 + +[postfix.qsize] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/postfix.qsize + # chart type = area + # type = postfix + # family = queue + # context = postfix.queued.size + # units = emails size in KB + # priority = 60002 + # gap when lost iterations above = 1 + # name = postfix.qsize + # title = Postfix Queue Emails Size (postfix.qsize) + # dim size name = size + # dim size algorithm = absolute + # dim size multiplier = 1 + # dim size divisor = 1 + +[disk_await.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_await.sda + # chart type = line + # type = disk_await + # family = sda + # context = disk.await + # units = ms per operation + # priority = 2005 + # gap when lost iterations above = 1 + # name = disk_await.sda + # title = Average Completed I/O Operation Time (disk_await.sda) + # dim reads name = reads + # dim reads algorithm = absolute + # dim reads multiplier = 1 + # dim reads divisor = 1 + # dim writes name = writes + # dim writes algorithm = absolute + # dim writes multiplier = -1 + # dim writes divisor = 1 + +[disk_avgsz.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_avgsz.sda + # chart type = area + # type = disk_avgsz + # family = sda + # context = disk.avgsz + # units = kilobytes per operation + # priority = 2006 + # gap when lost iterations above = 1 + # name = disk_avgsz.sda + # title = Average Completed I/O Operation Bandwidth (disk_avgsz.sda) + # dim reads name = reads + # dim reads algorithm = absolute + # dim reads multiplier = 512 + # dim reads divisor = 1024 + # dim writes name = writes + # dim writes algorithm = absolute + # dim writes multiplier = -512 + # dim writes divisor = 1024 + +[disk_svctm.sda] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/disk_svctm.sda + # chart type = line + # type = disk_svctm + # family = sda + # context = disk.svctm + # units = ms per operation + # priority = 2007 + # gap when lost iterations above = 1 + # name = disk_svctm.sda + # title = Average Service Time (disk_svctm.sda) + # dim svctm name = svctm + # dim svctm algorithm = absolute + # dim svctm multiplier = 1 + # dim svctm divisor = 1 + +[tc.eth1-ifb] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/tc.eth1_ifb + # chart type = stacked + # type = tc + # family = eth1 + # context = tc.qos + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = tc.mng_in + # title = Class Usage (tc.mng_in) + # dim 1:18 name = client + # dim 1:18 algorithm = incremental + # dim 1:18 multiplier = 8 + # dim 1:18 divisor = 1024 + # dim 1:19 name = nms + # dim 1:19 algorithm = incremental + # dim 1:19 multiplier = 8 + # dim 1:19 divisor = 1024 + # dim 1:8000 name = default + # dim 1:8000 algorithm = incremental + # dim 1:8000 multiplier = 8 + # dim 1:8000 divisor = 1024 + # dim 1:16 name = rsync + # dim 1:16 algorithm = incremental + # dim 1:16 multiplier = 8 + # dim 1:16 divisor = 1024 + # dim 1:17 name = web_server + # dim 1:17 algorithm = incremental + # dim 1:17 multiplier = 8 + # dim 1:17 divisor = 1024 + # dim 1:14 name = ntp + # dim 1:14 algorithm = incremental + # dim 1:14 multiplier = 8 + # dim 1:14 divisor = 1024 + # dim 1:15 name = ssh + # dim 1:15 algorithm = incremental + # dim 1:15 multiplier = 8 + # dim 1:15 divisor = 1024 + # dim 1:12 name = icmp + # dim 1:12 algorithm = incremental + # dim 1:12 multiplier = 8 + # dim 1:12 divisor = 1024 + # dim 1:13 name = dns + # dim 1:13 algorithm = incremental + # dim 1:13 multiplier = 8 + # dim 1:13 divisor = 1024 + # dim 1:11 name = arp + # dim 1:11 algorithm = incremental + # dim 1:11 multiplier = 8 + # dim 1:11 divisor = 1024 + +[tc.eth0] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/tc.eth0 + # chart type = stacked + # type = tc + # family = eth0 + # context = tc.qos + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = tc.world_out + # title = Class Usage (tc.world_out) + # dim 1:18 name = client + # dim 1:18 algorithm = incremental + # dim 1:18 multiplier = 8 + # dim 1:18 divisor = 1024 + # dim 1:19 name = nms + # dim 1:19 algorithm = incremental + # dim 1:19 multiplier = 8 + # dim 1:19 divisor = 1024 + # dim 1:8000 name = default + # dim 1:8000 algorithm = incremental + # dim 1:8000 multiplier = 8 + # dim 1:8000 divisor = 1024 + # dim 1:16 name = rsync + # dim 1:16 algorithm = incremental + # dim 1:16 multiplier = 8 + # dim 1:16 divisor = 1024 + # dim 1:17 name = web_server + # dim 1:17 algorithm = incremental + # dim 1:17 multiplier = 8 + # dim 1:17 divisor = 1024 + # dim 1:14 name = ntp + # dim 1:14 algorithm = incremental + # dim 1:14 multiplier = 8 + # dim 1:14 divisor = 1024 + # dim 1:15 name = ssh + # dim 1:15 algorithm = incremental + # dim 1:15 multiplier = 8 + # dim 1:15 divisor = 1024 + # dim 1:12 name = icmp + # dim 1:12 algorithm = incremental + # dim 1:12 multiplier = 8 + # dim 1:12 divisor = 1024 + # dim 1:13 name = dns + # dim 1:13 algorithm = incremental + # dim 1:13 multiplier = 8 + # dim 1:13 divisor = 1024 + # dim 1:11 name = arp + # dim 1:11 algorithm = incremental + # dim 1:11 multiplier = 8 + # dim 1:11 divisor = 1024 + +[tc.eth1] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/tc.eth1 + # chart type = stacked + # type = tc + # family = eth1 + # context = tc.qos + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = tc.mng_out + # title = Class Usage (tc.mng_out) + # dim 1:18 name = client + # dim 1:18 algorithm = incremental + # dim 1:18 multiplier = 8 + # dim 1:18 divisor = 1024 + # dim 1:19 name = nms + # dim 1:19 algorithm = incremental + # dim 1:19 multiplier = 8 + # dim 1:19 divisor = 1024 + # dim 1:8000 name = default + # dim 1:8000 algorithm = incremental + # dim 1:8000 multiplier = 8 + # dim 1:8000 divisor = 1024 + # dim 1:16 name = rsync + # dim 1:16 algorithm = incremental + # dim 1:16 multiplier = 8 + # dim 1:16 divisor = 1024 + # dim 1:17 name = web_server + # dim 1:17 algorithm = incremental + # dim 1:17 multiplier = 8 + # dim 1:17 divisor = 1024 + # dim 1:14 name = ntp + # dim 1:14 algorithm = incremental + # dim 1:14 multiplier = 8 + # dim 1:14 divisor = 1024 + # dim 1:15 name = ssh + # dim 1:15 algorithm = incremental + # dim 1:15 multiplier = 8 + # dim 1:15 divisor = 1024 + # dim 1:12 name = icmp + # dim 1:12 algorithm = incremental + # dim 1:12 multiplier = 8 + # dim 1:12 divisor = 1024 + # dim 1:13 name = dns + # dim 1:13 algorithm = incremental + # dim 1:13 multiplier = 8 + # dim 1:13 divisor = 1024 + # dim 1:11 name = arp + # dim 1:11 algorithm = incremental + # dim 1:11 multiplier = 8 + # dim 1:11 divisor = 1024 + +[mem.ksm] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/mem.ksm + # chart type = area + # type = mem + # family = ksm + # context = mem.ksm + # units = MB + # priority = 5000 + # gap when lost iterations above = 1 + # name = mem.ksm + # title = Kernel Same Page Merging (mem.ksm) + # dim shared name = shared + # dim shared algorithm = absolute + # dim shared multiplier = 1 + # dim shared divisor = 1048576 + # dim unshared name = unshared + # dim unshared algorithm = absolute + # dim unshared multiplier = -1 + # dim unshared divisor = 1048576 + # dim sharing name = sharing + # dim sharing algorithm = absolute + # dim sharing multiplier = 1 + # dim sharing divisor = 1048576 + # dim volatile name = volatile + # dim volatile algorithm = absolute + # dim volatile multiplier = -1 + # dim volatile divisor = 1048576 + # dim to_scan name = to scan + # dim to_scan algorithm = absolute + # dim to_scan multiplier = -1 + # dim to_scan divisor = 1048576 + +[mem.ksm_savings] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/mem.ksm_savings + # chart type = area + # type = mem + # family = ksm + # context = mem.ksm_savings + # units = MB + # priority = 5001 + # gap when lost iterations above = 1 + # name = mem.ksm_savings + # title = Kernel Same Page Merging Savings (mem.ksm_savings) + # dim savings name = savings + # dim savings algorithm = absolute + # dim savings multiplier = -1 + # dim savings divisor = 1048576 + # dim offered name = offered + # dim offered algorithm = absolute + # dim offered multiplier = 1 + # dim offered divisor = 1048576 + +[mem.ksm_ratios] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/mem.ksm_ratios + # chart type = line + # type = mem + # family = ksm + # context = mem.ksm_ratios + # units = percentage + # priority = 5002 + # gap when lost iterations above = 1 + # name = mem.ksm_ratios + # title = Kernel Same Page Merging Effectiveness (mem.ksm_ratios) + # dim savings name = savings + # dim savings algorithm = absolute + # dim savings multiplier = 1 + # dim savings divisor = 10000 + +[system.load] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.load + # chart type = line + # type = system + # family = load + # context = system.load + # units = load + # priority = 100 + # gap when lost iterations above = 1 + # name = system.load + # title = System Load Average (system.load) + # dim load1 name = load1 + # dim load1 algorithm = absolute + # dim load1 multiplier = 1 + # dim load1 divisor = 1000 + # dim load5 name = load5 + # dim load5 algorithm = absolute + # dim load5 multiplier = 1 + # dim load5 divisor = 1000 + # dim load15 name = load15 + # dim load15 algorithm = absolute + # dim load15 multiplier = 1 + # dim load15 divisor = 1000 + +[tc.eth0-ifb] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/tc.eth0_ifb + # chart type = stacked + # type = tc + # family = eth0 + # context = tc.qos + # units = kilobits/s + # priority = 7000 + # gap when lost iterations above = 1 + # name = tc.world_in + # title = Class Usage (tc.world_in) + # dim 1:18 name = client + # dim 1:18 algorithm = incremental + # dim 1:18 multiplier = 8 + # dim 1:18 divisor = 1024 + # dim 1:19 name = nms + # dim 1:19 algorithm = incremental + # dim 1:19 multiplier = 8 + # dim 1:19 divisor = 1024 + # dim 1:8000 name = default + # dim 1:8000 algorithm = incremental + # dim 1:8000 multiplier = 8 + # dim 1:8000 divisor = 1024 + # dim 1:16 name = rsync + # dim 1:16 algorithm = incremental + # dim 1:16 multiplier = 8 + # dim 1:16 divisor = 1024 + # dim 1:17 name = web_server + # dim 1:17 algorithm = incremental + # dim 1:17 multiplier = 8 + # dim 1:17 divisor = 1024 + # dim 1:14 name = ntp + # dim 1:14 algorithm = incremental + # dim 1:14 multiplier = 8 + # dim 1:14 divisor = 1024 + # dim 1:15 name = ssh + # dim 1:15 algorithm = incremental + # dim 1:15 multiplier = 8 + # dim 1:15 divisor = 1024 + # dim 1:12 name = icmp + # dim 1:12 algorithm = incremental + # dim 1:12 multiplier = 8 + # dim 1:12 divisor = 1024 + # dim 1:13 name = dns + # dim 1:13 algorithm = incremental + # dim 1:13 multiplier = 8 + # dim 1:13 divisor = 1024 + # dim 1:11 name = arp + # dim 1:11 algorithm = incremental + # dim 1:11 multiplier = 8 + # dim 1:11 divisor = 1024 + +[system.active_processes] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.active_processes + # chart type = line + # type = system + # family = processes + # context = system.active_processes + # units = processes + # priority = 750 + # gap when lost iterations above = 1 + # name = system.active_processes + # title = System Active Processes (system.active_processes) + # dim active name = active + # dim active algorithm = absolute + # dim active multiplier = 1 + # dim active divisor = 1 + +[cpu.cpu0_interrupts] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu0_interrupts + # chart type = stacked + # type = cpu + # family = interrupts + # context = cpu.interrupts + # units = interrupts/s + # priority = 2000 + # gap when lost iterations above = 1 + # name = cpu.cpu0_interrupts + # title = CPU0 Interrupts (cpu.cpu0_interrupts) + # dim 0 name = timer_0 + # dim 0 algorithm = incremental + # dim 0 multiplier = 1 + # dim 0 divisor = 1 + # dim 1 name = i8042_1 + # dim 1 algorithm = incremental + # dim 1 multiplier = 1 + # dim 1 divisor = 1 + # dim 6 name = floppy_6 + # dim 6 algorithm = incremental + # dim 6 multiplier = 1 + # dim 6 divisor = 1 + # dim 8 name = rtc0_8 + # dim 8 algorithm = incremental + # dim 8 multiplier = 1 + # dim 8 divisor = 1 + # dim 9 name = acpi_9 + # dim 9 algorithm = incremental + # dim 9 multiplier = 1 + # dim 9 divisor = 1 + # dim 12 name = i8042_12 + # dim 12 algorithm = incremental + # dim 12 multiplier = 1 + # dim 12 divisor = 1 + # dim 14 name = ata_piix_14 + # dim 14 algorithm = incremental + # dim 14 multiplier = 1 + # dim 14 divisor = 1 + # dim 15 name = ata_piix_15 + # dim 15 algorithm = incremental + # dim 15 multiplier = 1 + # dim 15 divisor = 1 + # dim NMI name = NMI + # dim NMI algorithm = incremental + # dim NMI multiplier = 1 + # dim NMI divisor = 1 + # dim LOC name = LOC + # dim LOC algorithm = incremental + # dim LOC multiplier = 1 + # dim LOC divisor = 1 + # dim SPU name = SPU + # dim SPU algorithm = incremental + # dim SPU multiplier = 1 + # dim SPU divisor = 1 + # dim PMI name = PMI + # dim PMI algorithm = incremental + # dim PMI multiplier = 1 + # dim PMI divisor = 1 + # dim IWI name = IWI + # dim IWI algorithm = incremental + # dim IWI multiplier = 1 + # dim IWI divisor = 1 + # dim RTR name = RTR + # dim RTR algorithm = incremental + # dim RTR multiplier = 1 + # dim RTR divisor = 1 + # dim RES name = RES + # dim RES algorithm = incremental + # dim RES multiplier = 1 + # dim RES divisor = 1 + # dim CAL name = CAL + # dim CAL algorithm = incremental + # dim CAL multiplier = 1 + # dim CAL divisor = 1 + # dim TLB name = TLB + # dim TLB algorithm = incremental + # dim TLB multiplier = 1 + # dim TLB divisor = 1 + # dim TRM name = TRM + # dim TRM algorithm = incremental + # dim TRM multiplier = 1 + # dim TRM divisor = 1 + # dim THR name = THR + # dim THR algorithm = incremental + # dim THR multiplier = 1 + # dim THR divisor = 1 + # dim MCE name = MCE + # dim MCE algorithm = incremental + # dim MCE multiplier = 1 + # dim MCE divisor = 1 + # dim MCP name = MCP + # dim MCP algorithm = incremental + # dim MCP multiplier = 1 + # dim MCP divisor = 1 + # dim HYP name = HYP + # dim HYP algorithm = incremental + # dim HYP multiplier = 1 + # dim HYP divisor = 1 + # dim ERR name = ERR + # dim ERR algorithm = incremental + # dim ERR multiplier = 1 + # dim ERR divisor = 1 + # dim MIS name = MIS + # dim MIS algorithm = incremental + # dim MIS multiplier = 1 + # dim MIS divisor = 1 + +[cpu.cpu1_interrupts] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu1_interrupts + # chart type = stacked + # type = cpu + # family = interrupts + # context = cpu.interrupts + # units = interrupts/s + # priority = 2001 + # gap when lost iterations above = 1 + # name = cpu.cpu1_interrupts + # title = CPU1 Interrupts (cpu.cpu1_interrupts) + # dim 0 name = timer_0 + # dim 0 algorithm = incremental + # dim 0 multiplier = 1 + # dim 0 divisor = 1 + # dim 1 name = i8042_1 + # dim 1 algorithm = incremental + # dim 1 multiplier = 1 + # dim 1 divisor = 1 + # dim 6 name = floppy_6 + # dim 6 algorithm = incremental + # dim 6 multiplier = 1 + # dim 6 divisor = 1 + # dim 8 name = rtc0_8 + # dim 8 algorithm = incremental + # dim 8 multiplier = 1 + # dim 8 divisor = 1 + # dim 9 name = acpi_9 + # dim 9 algorithm = incremental + # dim 9 multiplier = 1 + # dim 9 divisor = 1 + # dim 12 name = i8042_12 + # dim 12 algorithm = incremental + # dim 12 multiplier = 1 + # dim 12 divisor = 1 + # dim 14 name = ata_piix_14 + # dim 14 algorithm = incremental + # dim 14 multiplier = 1 + # dim 14 divisor = 1 + # dim 15 name = ata_piix_15 + # dim 15 algorithm = incremental + # dim 15 multiplier = 1 + # dim 15 divisor = 1 + # dim NMI name = NMI + # dim NMI algorithm = incremental + # dim NMI multiplier = 1 + # dim NMI divisor = 1 + # dim LOC name = LOC + # dim LOC algorithm = incremental + # dim LOC multiplier = 1 + # dim LOC divisor = 1 + # dim SPU name = SPU + # dim SPU algorithm = incremental + # dim SPU multiplier = 1 + # dim SPU divisor = 1 + # dim PMI name = PMI + # dim PMI algorithm = incremental + # dim PMI multiplier = 1 + # dim PMI divisor = 1 + # dim IWI name = IWI + # dim IWI algorithm = incremental + # dim IWI multiplier = 1 + # dim IWI divisor = 1 + # dim RTR name = RTR + # dim RTR algorithm = incremental + # dim RTR multiplier = 1 + # dim RTR divisor = 1 + # dim RES name = RES + # dim RES algorithm = incremental + # dim RES multiplier = 1 + # dim RES divisor = 1 + # dim CAL name = CAL + # dim CAL algorithm = incremental + # dim CAL multiplier = 1 + # dim CAL divisor = 1 + # dim TLB name = TLB + # dim TLB algorithm = incremental + # dim TLB multiplier = 1 + # dim TLB divisor = 1 + # dim TRM name = TRM + # dim TRM algorithm = incremental + # dim TRM multiplier = 1 + # dim TRM divisor = 1 + # dim THR name = THR + # dim THR algorithm = incremental + # dim THR multiplier = 1 + # dim THR divisor = 1 + # dim MCE name = MCE + # dim MCE algorithm = incremental + # dim MCE multiplier = 1 + # dim MCE divisor = 1 + # dim MCP name = MCP + # dim MCP algorithm = incremental + # dim MCP multiplier = 1 + # dim MCP divisor = 1 + # dim HYP name = HYP + # dim HYP algorithm = incremental + # dim HYP multiplier = 1 + # dim HYP divisor = 1 + # dim ERR name = ERR + # dim ERR algorithm = incremental + # dim ERR multiplier = 1 + # dim ERR divisor = 1 + # dim MIS name = MIS + # dim MIS algorithm = incremental + # dim MIS multiplier = 1 + # dim MIS divisor = 1 + +[example.random2] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/example.random2 + # chart type = area + # type = example + # family = random + # context = random + # units = random number + # priority = 150001 + # gap when lost iterations above = 1 + # name = example.random2 + # title = A random number (example.random2) + # dim random name = random + # dim random algorithm = absolute + # dim random multiplier = 1 + # dim random divisor = 1 + +[mysql_local.net] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.net + # chart type = area + # type = mysql_local + # family = bandwidth + # context = mysql.net + # units = kilobits/s + # priority = 60001 + # gap when lost iterations above = 1 + # name = mysql_local.net + # title = mysql Bandwidth (mysql_local.net) + # dim Bytes_received name = in + # dim Bytes_received algorithm = incremental + # dim Bytes_received multiplier = 8 + # dim Bytes_received divisor = 1024 + # dim Bytes_sent name = out + # dim Bytes_sent algorithm = incremental + # dim Bytes_sent multiplier = -8 + # dim Bytes_sent divisor = 1024 + +[mysql_local.queries] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.queries + # chart type = line + # type = mysql_local + # family = queries + # context = mysql.queries + # units = queries/s + # priority = 60002 + # gap when lost iterations above = 1 + # name = mysql_local.queries + # title = mysql Queries (mysql_local.queries) + # dim Queries name = queries + # dim Queries algorithm = incremental + # dim Queries multiplier = 1 + # dim Queries divisor = 1 + # dim Questions name = questions + # dim Questions algorithm = incremental + # dim Questions multiplier = 1 + # dim Questions divisor = 1 + # dim Slow_queries name = slow_queries + # dim Slow_queries algorithm = incremental + # dim Slow_queries multiplier = -1 + # dim Slow_queries divisor = 1 + +[mysql_local.handlers] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.handlers + # chart type = line + # type = mysql_local + # family = handlers + # context = mysql.handlers + # units = handlers/s + # priority = 60003 + # gap when lost iterations above = 1 + # name = mysql_local.handlers + # title = mysql Handlers (mysql_local.handlers) + # dim Handler_commit name = commit + # dim Handler_commit algorithm = incremental + # dim Handler_commit multiplier = 1 + # dim Handler_commit divisor = 1 + # dim Handler_delete name = delete + # dim Handler_delete algorithm = incremental + # dim Handler_delete multiplier = 1 + # dim Handler_delete divisor = 1 + # dim Handler_prepare name = prepare + # dim Handler_prepare algorithm = incremental + # dim Handler_prepare multiplier = 1 + # dim Handler_prepare divisor = 1 + # dim Handler_read_first name = read_first + # dim Handler_read_first algorithm = incremental + # dim Handler_read_first multiplier = 1 + # dim Handler_read_first divisor = 1 + # dim Handler_read_key name = read_key + # dim Handler_read_key algorithm = incremental + # dim Handler_read_key multiplier = 1 + # dim Handler_read_key divisor = 1 + # dim Handler_read_next name = read_next + # dim Handler_read_next algorithm = incremental + # dim Handler_read_next multiplier = 1 + # dim Handler_read_next divisor = 1 + # dim Handler_read_prev name = read_prev + # dim Handler_read_prev algorithm = incremental + # dim Handler_read_prev multiplier = 1 + # dim Handler_read_prev divisor = 1 + # dim Handler_read_rnd name = read_rnd + # dim Handler_read_rnd algorithm = incremental + # dim Handler_read_rnd multiplier = 1 + # dim Handler_read_rnd divisor = 1 + # dim Handler_read_rnd_next name = read_rnd_next + # dim Handler_read_rnd_next algorithm = incremental + # dim Handler_read_rnd_next multiplier = 1 + # dim Handler_read_rnd_next divisor = 1 + # dim Handler_rollback name = rollback + # dim Handler_rollback algorithm = incremental + # dim Handler_rollback multiplier = 1 + # dim Handler_rollback divisor = 1 + # dim Handler_savepoint name = savepoint + # dim Handler_savepoint algorithm = incremental + # dim Handler_savepoint multiplier = 1 + # dim Handler_savepoint divisor = 1 + # dim Handler_savepoint_rollback name = savepoint_rollback + # dim Handler_savepoint_rollback algorithm = incremental + # dim Handler_savepoint_rollback multiplier = 1 + # dim Handler_savepoint_rollback divisor = 1 + # dim Handler_update name = update + # dim Handler_update algorithm = incremental + # dim Handler_update multiplier = 1 + # dim Handler_update divisor = 1 + # dim Handler_write name = write + # dim Handler_write algorithm = incremental + # dim Handler_write multiplier = 1 + # dim Handler_write divisor = 1 + +[system.softirqs] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/system.softirqs + # chart type = stacked + # type = system + # family = softirqs + # context = system.softirqs + # units = softirqs/s + # priority = 950 + # gap when lost iterations above = 1 + # name = system.softirqs + # title = System softirqs (system.softirqs) + # dim HI name = HI + # dim HI algorithm = incremental + # dim HI multiplier = 1 + # dim HI divisor = 1 + # dim TIMER name = TIMER + # dim TIMER algorithm = incremental + # dim TIMER multiplier = 1 + # dim TIMER divisor = 1 + # dim NET_TX name = NET_TX + # dim NET_TX algorithm = incremental + # dim NET_TX multiplier = 1 + # dim NET_TX divisor = 1 + # dim NET_RX name = NET_RX + # dim NET_RX algorithm = incremental + # dim NET_RX multiplier = 1 + # dim NET_RX divisor = 1 + # dim BLOCK name = BLOCK + # dim BLOCK algorithm = incremental + # dim BLOCK multiplier = 1 + # dim BLOCK divisor = 1 + # dim BLOCK_IOPOLL name = BLOCK_IOPOLL + # dim BLOCK_IOPOLL algorithm = incremental + # dim BLOCK_IOPOLL multiplier = 1 + # dim BLOCK_IOPOLL divisor = 1 + # dim TASKLET name = TASKLET + # dim TASKLET algorithm = incremental + # dim TASKLET multiplier = 1 + # dim TASKLET divisor = 1 + # dim SCHED name = SCHED + # dim SCHED algorithm = incremental + # dim SCHED multiplier = 1 + # dim SCHED divisor = 1 + # dim HRTIMER name = HRTIMER + # dim HRTIMER algorithm = incremental + # dim HRTIMER multiplier = 1 + # dim HRTIMER divisor = 1 + # dim RCU name = RCU + # dim RCU algorithm = incremental + # dim RCU multiplier = 1 + # dim RCU divisor = 1 + +[cpu.cpu0_softirqs] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu0_softirqs + # chart type = stacked + # type = cpu + # family = softirqs + # context = cpu.softirqs + # units = softirqs/s + # priority = 3000 + # gap when lost iterations above = 1 + # name = cpu.cpu0_softirqs + # title = CPU0 softirqs (cpu.cpu0_softirqs) + # dim HI name = HI + # dim HI algorithm = incremental + # dim HI multiplier = 1 + # dim HI divisor = 1 + # dim TIMER name = TIMER + # dim TIMER algorithm = incremental + # dim TIMER multiplier = 1 + # dim TIMER divisor = 1 + # dim NET_TX name = NET_TX + # dim NET_TX algorithm = incremental + # dim NET_TX multiplier = 1 + # dim NET_TX divisor = 1 + # dim NET_RX name = NET_RX + # dim NET_RX algorithm = incremental + # dim NET_RX multiplier = 1 + # dim NET_RX divisor = 1 + # dim BLOCK name = BLOCK + # dim BLOCK algorithm = incremental + # dim BLOCK multiplier = 1 + # dim BLOCK divisor = 1 + # dim BLOCK_IOPOLL name = BLOCK_IOPOLL + # dim BLOCK_IOPOLL algorithm = incremental + # dim BLOCK_IOPOLL multiplier = 1 + # dim BLOCK_IOPOLL divisor = 1 + # dim TASKLET name = TASKLET + # dim TASKLET algorithm = incremental + # dim TASKLET multiplier = 1 + # dim TASKLET divisor = 1 + # dim SCHED name = SCHED + # dim SCHED algorithm = incremental + # dim SCHED multiplier = 1 + # dim SCHED divisor = 1 + # dim HRTIMER name = HRTIMER + # dim HRTIMER algorithm = incremental + # dim HRTIMER multiplier = 1 + # dim HRTIMER divisor = 1 + # dim RCU name = RCU + # dim RCU algorithm = incremental + # dim RCU multiplier = 1 + # dim RCU divisor = 1 + +[mysql_local.table_locks] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.table_locks + # chart type = line + # type = mysql_local + # family = locks + # context = mysql.table_locks + # units = locks/s + # priority = 60004 + # gap when lost iterations above = 1 + # name = mysql_local.table_locks + # title = mysql Tables Locks (mysql_local.table_locks) + # dim Table_locks_immediate name = immediate + # dim Table_locks_immediate algorithm = incremental + # dim Table_locks_immediate multiplier = 1 + # dim Table_locks_immediate divisor = 1 + # dim Table_locks_waited name = waited + # dim Table_locks_waited algorithm = incremental + # dim Table_locks_waited multiplier = -1 + # dim Table_locks_waited divisor = 1 + +[mysql_local.join_issues] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.join_issues + # chart type = line + # type = mysql_local + # family = issues + # context = mysql.join_issues + # units = joins/s + # priority = 60005 + # gap when lost iterations above = 1 + # name = mysql_local.join_issues + # title = mysql Select Join Issues (mysql_local.join_issues) + # dim Select_full_join name = full_join + # dim Select_full_join algorithm = incremental + # dim Select_full_join multiplier = 1 + # dim Select_full_join divisor = 1 + # dim Select_full_range_join name = full_range_join + # dim Select_full_range_join algorithm = incremental + # dim Select_full_range_join multiplier = 1 + # dim Select_full_range_join divisor = 1 + # dim Select_range name = range + # dim Select_range algorithm = incremental + # dim Select_range multiplier = 1 + # dim Select_range divisor = 1 + # dim Select_range_check name = range_check + # dim Select_range_check algorithm = incremental + # dim Select_range_check multiplier = 1 + # dim Select_range_check divisor = 1 + # dim Select_scan name = scan + # dim Select_scan algorithm = incremental + # dim Select_scan multiplier = 1 + # dim Select_scan divisor = 1 + +[cpu.cpu1_softirqs] + # history = 86400 + # enabled = yes + # cache directory = /var/cache/netdata/cpu.cpu1_softirqs + # chart type = stacked + # type = cpu + # family = softirqs + # context = cpu.softirqs + # units = softirqs/s + # priority = 3001 + # gap when lost iterations above = 1 + # name = cpu.cpu1_softirqs + # title = CPU1 softirqs (cpu.cpu1_softirqs) + # dim HI name = HI + # dim HI algorithm = incremental + # dim HI multiplier = 1 + # dim HI divisor = 1 + # dim TIMER name = TIMER + # dim TIMER algorithm = incremental + # dim TIMER multiplier = 1 + # dim TIMER divisor = 1 + # dim NET_TX name = NET_TX + # dim NET_TX algorithm = incremental + # dim NET_TX multiplier = 1 + # dim NET_TX divisor = 1 + # dim NET_RX name = NET_RX + # dim NET_RX algorithm = incremental + # dim NET_RX multiplier = 1 + # dim NET_RX divisor = 1 + # dim BLOCK name = BLOCK + # dim BLOCK algorithm = incremental + # dim BLOCK multiplier = 1 + # dim BLOCK divisor = 1 + # dim BLOCK_IOPOLL name = BLOCK_IOPOLL + # dim BLOCK_IOPOLL algorithm = incremental + # dim BLOCK_IOPOLL multiplier = 1 + # dim BLOCK_IOPOLL divisor = 1 + # dim TASKLET name = TASKLET + # dim TASKLET algorithm = incremental + # dim TASKLET multiplier = 1 + # dim TASKLET divisor = 1 + # dim SCHED name = SCHED + # dim SCHED algorithm = incremental + # dim SCHED multiplier = 1 + # dim SCHED divisor = 1 + # dim HRTIMER name = HRTIMER + # dim HRTIMER algorithm = incremental + # dim HRTIMER multiplier = 1 + # dim HRTIMER divisor = 1 + # dim RCU name = RCU + # dim RCU algorithm = incremental + # dim RCU multiplier = 1 + # dim RCU divisor = 1 + +[mysql_local.sort_issues] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.sort_issues + # chart type = line + # type = mysql_local + # family = issues + # context = mysql.sort.issues + # units = issues/s + # priority = 60006 + # gap when lost iterations above = 1 + # name = mysql_local.sort_issues + # title = mysql Sort Issues (mysql_local.sort_issues) + # dim Sort_merge_passes name = merge_passes + # dim Sort_merge_passes algorithm = incremental + # dim Sort_merge_passes multiplier = 1 + # dim Sort_merge_passes divisor = 1 + # dim Sort_range name = range + # dim Sort_range algorithm = incremental + # dim Sort_range multiplier = 1 + # dim Sort_range divisor = 1 + # dim Sort_scan name = scan + # dim Sort_scan algorithm = incremental + # dim Sort_scan multiplier = 1 + # dim Sort_scan divisor = 1 + +[mysql_local.tmp] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.tmp + # chart type = line + # type = mysql_local + # family = temporaries + # context = mysql.tmp + # units = counter + # priority = 60007 + # gap when lost iterations above = 1 + # name = mysql_local.tmp + # title = mysql Tmp Operations (mysql_local.tmp) + # dim Created_tmp_disk_tables name = disk_tables + # dim Created_tmp_disk_tables algorithm = incremental + # dim Created_tmp_disk_tables multiplier = 1 + # dim Created_tmp_disk_tables divisor = 1 + # dim Created_tmp_files name = files + # dim Created_tmp_files algorithm = incremental + # dim Created_tmp_files multiplier = 1 + # dim Created_tmp_files divisor = 1 + # dim Created_tmp_tables name = tables + # dim Created_tmp_tables algorithm = incremental + # dim Created_tmp_tables multiplier = 1 + # dim Created_tmp_tables divisor = 1 + +[mysql_local.connections] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.connections + # chart type = line + # type = mysql_local + # family = connections + # context = mysql.connections + # units = connections/s + # priority = 60008 + # gap when lost iterations above = 1 + # name = mysql_local.connections + # title = mysql Connections (mysql_local.connections) + # dim Connections name = all + # dim Connections algorithm = incremental + # dim Connections multiplier = 1 + # dim Connections divisor = 1 + # dim Aborted_connects name = aborded + # dim Aborted_connects algorithm = incremental + # dim Aborted_connects multiplier = 1 + # dim Aborted_connects divisor = 1 + +[mysql_local.binlog_cache] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.binlog_cache + # chart type = line + # type = mysql_local + # family = binlog + # context = mysql.binlog_cache + # units = transactions/s + # priority = 60009 + # gap when lost iterations above = 1 + # name = mysql_local.binlog_cache + # title = mysql Binlog Cache (mysql_local.binlog_cache) + # dim Binlog_cache_disk_use name = disk + # dim Binlog_cache_disk_use algorithm = incremental + # dim Binlog_cache_disk_use multiplier = 1 + # dim Binlog_cache_disk_use divisor = 1 + # dim Binlog_cache_use name = all + # dim Binlog_cache_use algorithm = incremental + # dim Binlog_cache_use multiplier = 1 + # dim Binlog_cache_use divisor = 1 + +[mysql_local.threads] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.threads + # chart type = line + # type = mysql_local + # family = threads + # context = mysql.threads + # units = threads + # priority = 60010 + # gap when lost iterations above = 1 + # name = mysql_local.threads + # title = mysql Threads (mysql_local.threads) + # dim Threads_connected name = connected + # dim Threads_connected algorithm = absolute + # dim Threads_connected multiplier = 1 + # dim Threads_connected divisor = 1 + # dim Threads_created name = created + # dim Threads_created algorithm = incremental + # dim Threads_created multiplier = 1 + # dim Threads_created divisor = 1 + # dim Threads_cached name = cached + # dim Threads_cached algorithm = absolute + # dim Threads_cached multiplier = -1 + # dim Threads_cached divisor = 1 + # dim Threads_running name = running + # dim Threads_running algorithm = absolute + # dim Threads_running multiplier = 1 + # dim Threads_running divisor = 1 + +[mysql_local.thread_cache_misses] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.thread_cache_misses + # chart type = area + # type = mysql_local + # family = threads + # context = mysql.thread_cache_misses + # units = misses + # priority = 60011 + # gap when lost iterations above = 1 + # name = mysql_local.thread_cache_misses + # title = mysql Threads Cache Misses (mysql_local.thread_cache_misses) + # dim misses name = misses + # dim misses algorithm = absolute + # dim misses multiplier = 1 + # dim misses divisor = 100 + +[mysql_local.innodb_io] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_io + # chart type = area + # type = mysql_local + # family = innodb + # context = mysql.innodb_io + # units = kilobytes/s + # priority = 60012 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_io + # title = mysql InnoDB I/O Bandwidth (mysql_local.innodb_io) + # dim Innodb_data_read name = read + # dim Innodb_data_read algorithm = incremental + # dim Innodb_data_read multiplier = 1 + # dim Innodb_data_read divisor = 1024 + # dim Innodb_data_written name = write + # dim Innodb_data_written algorithm = incremental + # dim Innodb_data_written multiplier = -1 + # dim Innodb_data_written divisor = 1024 + +[mysql_local.innodb_io_ops] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_io_ops + # chart type = line + # type = mysql_local + # family = innodb + # context = mysql.innodb_io_ops + # units = operations/s + # priority = 60013 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_io_ops + # title = mysql InnoDB I/O Operations (mysql_local.innodb_io_ops) + # dim Innodb_data_reads name = reads + # dim Innodb_data_reads algorithm = incremental + # dim Innodb_data_reads multiplier = 1 + # dim Innodb_data_reads divisor = 1 + # dim Innodb_data_writes name = writes + # dim Innodb_data_writes algorithm = incremental + # dim Innodb_data_writes multiplier = -1 + # dim Innodb_data_writes divisor = 1 + # dim Innodb_data_fsyncs name = fsyncs + # dim Innodb_data_fsyncs algorithm = incremental + # dim Innodb_data_fsyncs multiplier = 1 + # dim Innodb_data_fsyncs divisor = 1 + +[mysql_local.innodb_io_pending_ops] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_io_pending_ops + # chart type = line + # type = mysql_local + # family = innodb + # context = mysql.innodb_io_pending_ops + # units = operations + # priority = 60014 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_io_pending_ops + # title = mysql InnoDB Pending I/O Operations (mysql_local.innodb_io_pending_ops) + # dim Innodb_data_pending_reads name = reads + # dim Innodb_data_pending_reads algorithm = absolute + # dim Innodb_data_pending_reads multiplier = 1 + # dim Innodb_data_pending_reads divisor = 1 + # dim Innodb_data_pending_writes name = writes + # dim Innodb_data_pending_writes algorithm = absolute + # dim Innodb_data_pending_writes multiplier = -1 + # dim Innodb_data_pending_writes divisor = 1 + # dim Innodb_data_pending_fsyncs name = fsyncs + # dim Innodb_data_pending_fsyncs algorithm = absolute + # dim Innodb_data_pending_fsyncs multiplier = 1 + # dim Innodb_data_pending_fsyncs divisor = 1 + +[mysql_local.innodb_log] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_log + # chart type = line + # type = mysql_local + # family = innodb + # context = mysql.innodb_log + # units = operations/s + # priority = 60015 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_log + # title = mysql InnoDB Log Operations (mysql_local.innodb_log) + # dim Innodb_log_waits name = waits + # dim Innodb_log_waits algorithm = incremental + # dim Innodb_log_waits multiplier = 1 + # dim Innodb_log_waits divisor = 1 + # dim Innodb_log_write_requests name = write_requests + # dim Innodb_log_write_requests algorithm = incremental + # dim Innodb_log_write_requests multiplier = -1 + # dim Innodb_log_write_requests divisor = 1 + # dim Innodb_log_writes name = writes + # dim Innodb_log_writes algorithm = incremental + # dim Innodb_log_writes multiplier = -1 + # dim Innodb_log_writes divisor = 1 + +[mysql_local.innodb_os_log] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_os_log + # chart type = line + # type = mysql_local + # family = innodb + # context = mysql.innodb_os_log + # units = operations + # priority = 60016 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_os_log + # title = mysql InnoDB OS Log Operations (mysql_local.innodb_os_log) + # dim Innodb_os_log_fsyncs name = fsyncs + # dim Innodb_os_log_fsyncs algorithm = incremental + # dim Innodb_os_log_fsyncs multiplier = 1 + # dim Innodb_os_log_fsyncs divisor = 1 + # dim Innodb_os_log_pending_fsyncs name = pending_fsyncs + # dim Innodb_os_log_pending_fsyncs algorithm = absolute + # dim Innodb_os_log_pending_fsyncs multiplier = 1 + # dim Innodb_os_log_pending_fsyncs divisor = 1 + # dim Innodb_os_log_pending_writes name = pending_writes + # dim Innodb_os_log_pending_writes algorithm = absolute + # dim Innodb_os_log_pending_writes multiplier = -1 + # dim Innodb_os_log_pending_writes divisor = 1 + +[mysql_local.innodb_os_log_io] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_os_log_io + # chart type = area + # type = mysql_local + # family = innodb + # context = mysql.innodb_os_log_io + # units = kilobytes/s + # priority = 60017 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_os_log_io + # title = mysql InnoDB OS Log Bandwidth (mysql_local.innodb_os_log_io) + # dim Innodb_os_log_written name = write + # dim Innodb_os_log_written algorithm = incremental + # dim Innodb_os_log_written multiplier = -1 + # dim Innodb_os_log_written divisor = 1024 + +[mysql_local.innodb_cur_row_lock] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_cur_row_lock + # chart type = area + # type = mysql_local + # family = innodb + # context = mysql.innodb_cur_row_lock + # units = operations + # priority = 60018 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_cur_row_lock + # title = mysql InnoDB Current Row Locks (mysql_local.innodb_cur_row_lock) + # dim Innodb_row_lock_current_waits name = current_waits + # dim Innodb_row_lock_current_waits algorithm = absolute + # dim Innodb_row_lock_current_waits multiplier = 1 + # dim Innodb_row_lock_current_waits divisor = 1 + +[mysql_local.innodb_rows] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.innodb_rows + # chart type = area + # type = mysql_local + # family = innodb + # context = mysql.innodb_rows + # units = operations/s + # priority = 60019 + # gap when lost iterations above = 1 + # name = mysql_local.innodb_rows + # title = mysql InnoDB Row Operations (mysql_local.innodb_rows) + # dim Innodb_rows_read name = read + # dim Innodb_rows_read algorithm = incremental + # dim Innodb_rows_read multiplier = 1 + # dim Innodb_rows_read divisor = 1 + # dim Innodb_rows_deleted name = deleted + # dim Innodb_rows_deleted algorithm = incremental + # dim Innodb_rows_deleted multiplier = -1 + # dim Innodb_rows_deleted divisor = 1 + # dim Innodb_rows_inserted name = inserted + # dim Innodb_rows_inserted algorithm = incremental + # dim Innodb_rows_inserted multiplier = 1 + # dim Innodb_rows_inserted divisor = 1 + # dim Innodb_rows_updated name = updated + # dim Innodb_rows_updated algorithm = incremental + # dim Innodb_rows_updated multiplier = -1 + # dim Innodb_rows_updated divisor = 1 + +[mysql_local.binlog_stmt_cache] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mysql_local.binlog_stmt_cache + # chart type = line + # type = mysql_local + # family = binlog + # context = mysql.binlog_stmt_cache + # units = statements/s + # priority = 60020 + # gap when lost iterations above = 1 + # name = mysql_local.binlog_stmt_cache + # title = mysql Binlog Statement Cache (mysql_local.binlog_stmt_cache) + # dim Binlog_stmt_cache_disk_use name = disk + # dim Binlog_stmt_cache_disk_use algorithm = incremental + # dim Binlog_stmt_cache_disk_use multiplier = 1 + # dim Binlog_stmt_cache_disk_use divisor = 1 + # dim Binlog_stmt_cache_use name = all + # dim Binlog_stmt_cache_use algorithm = incremental + # dim Binlog_stmt_cache_use multiplier = 1 + # dim Binlog_stmt_cache_use divisor = 1 + +[system.ipv6] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/system.ipv6 + # chart type = area + # type = system + # family = network + # context = system.ipv6 + # units = kilobits/s + # priority = 500 + # gap when lost iterations above = 1 + # name = system.ipv6 + # title = IPv6 Bandwidth (system.ipv6) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[ipv6.packets] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/ipv6.packets + # chart type = line + # type = ipv6 + # family = packets + # context = ipv6.packets + # units = packets/s + # priority = 3000 + # gap when lost iterations above = 1 + # name = ipv6.packets + # title = IPv6 Packets (ipv6.packets) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + # dim forwarded name = forwarded + # dim forwarded algorithm = incremental + # dim forwarded multiplier = 1 + # dim forwarded divisor = 1 + # dim delivers name = delivers + # dim delivers algorithm = incremental + # dim delivers multiplier = -1 + # dim delivers divisor = 1 + +[ipv6.udppackets] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.udppackets + # chart type = line + # type = ipv6 + # family = udp + # context = ipv6.udppackets + # units = packets/s + # priority = 3601 + # gap when lost iterations above = 1 + # name = ipv6.udppackets + # title = IPv6 UDP Packets (ipv6.udppackets) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[ipv6.mcast] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.mcast + # chart type = area + # type = ipv6 + # family = multicast + # context = ipv6.mcast + # units = kilobits/s + # priority = 9000 + # gap when lost iterations above = 1 + # name = ipv6.mcast + # title = IPv6 Multicast Bandwidth (ipv6.mcast) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 8 + # dim received divisor = 1024 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -8 + # dim sent divisor = 1024 + +[ipv6.mcastpkts] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.mcastpkts + # chart type = line + # type = ipv6 + # family = multicast + # context = ipv6.mcastpkts + # units = packets/s + # priority = 9500 + # gap when lost iterations above = 1 + # name = ipv6.mcastpkts + # title = IPv6 Multicast Packets (ipv6.mcastpkts) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[nginx.connections] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/nginx.connections + # chart type = line + # type = nginx + # family = nginx + # context = nginx.connections + # units = connections + # priority = 60001 + # gap when lost iterations above = 1 + # name = nginx.connections + # title = nginx Active Connections (nginx.connections) + # dim active name = active + # dim active algorithm = absolute + # dim active multiplier = 1 + # dim active divisor = 1 + +[ipv6.icmp] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.icmp + # chart type = line + # type = ipv6 + # family = icmp + # context = ipv6.icmp + # units = messages/s + # priority = 10000 + # gap when lost iterations above = 1 + # name = ipv6.icmp + # title = IPv6 ICMP Messages (ipv6.icmp) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[ipv6.icmprouter] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.icmprouter + # chart type = line + # type = ipv6 + # family = icmp + # context = ipv6.icmprouter + # units = messages/s + # priority = 10400 + # gap when lost iterations above = 1 + # name = ipv6.icmprouter + # title = IPv6 Router Messages (ipv6.icmprouter) + # dim InSolicits name = InSolicits + # dim InSolicits algorithm = incremental + # dim InSolicits multiplier = 1 + # dim InSolicits divisor = 1 + # dim OutSolicits name = OutSolicits + # dim OutSolicits algorithm = incremental + # dim OutSolicits multiplier = -1 + # dim OutSolicits divisor = 1 + # dim InAdvertisements name = InAdvertisements + # dim InAdvertisements algorithm = incremental + # dim InAdvertisements multiplier = 1 + # dim InAdvertisements divisor = 1 + # dim OutAdvertisements name = OutAdvertisements + # dim OutAdvertisements algorithm = incremental + # dim OutAdvertisements multiplier = -1 + # dim OutAdvertisements divisor = 1 + +[ipv6.icmpneighbor] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.icmpneighbor + # chart type = line + # type = ipv6 + # family = icmp + # context = ipv6.icmpneighbor + # units = messages/s + # priority = 10500 + # gap when lost iterations above = 1 + # name = ipv6.icmpneighbor + # title = IPv6 Neighbor Messages (ipv6.icmpneighbor) + # dim InSolicits name = InSolicits + # dim InSolicits algorithm = incremental + # dim InSolicits multiplier = 1 + # dim InSolicits divisor = 1 + # dim OutSolicits name = OutSolicits + # dim OutSolicits algorithm = incremental + # dim OutSolicits multiplier = -1 + # dim OutSolicits divisor = 1 + # dim InAdvertisements name = InAdvertisements + # dim InAdvertisements algorithm = incremental + # dim InAdvertisements multiplier = 1 + # dim InAdvertisements divisor = 1 + # dim OutAdvertisements name = OutAdvertisements + # dim OutAdvertisements algorithm = incremental + # dim OutAdvertisements multiplier = -1 + # dim OutAdvertisements divisor = 1 + +[ipv6.icmpmldv2] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.icmpmldv2 + # chart type = line + # type = ipv6 + # family = icmp + # context = ipv6.icmpmldv2 + # units = reports/s + # priority = 10600 + # gap when lost iterations above = 1 + # name = ipv6.icmpmldv2 + # title = IPv6 ICMP MLDv2 Reports (ipv6.icmpmldv2) + # dim received name = received + # dim received algorithm = incremental + # dim received multiplier = 1 + # dim received divisor = 1 + # dim sent name = sent + # dim sent algorithm = incremental + # dim sent multiplier = -1 + # dim sent divisor = 1 + +[ipv6.icmptypes] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.icmptypes + # chart type = line + # type = ipv6 + # family = icmp + # context = ipv6.icmptypes + # units = messages/s + # priority = 10700 + # gap when lost iterations above = 1 + # name = ipv6.icmptypes + # title = IPv6 ICMP Types (ipv6.icmptypes) + # dim InType1 name = InType1 + # dim InType1 algorithm = incremental + # dim InType1 multiplier = 1 + # dim InType1 divisor = 1 + # dim InType128 name = InType128 + # dim InType128 algorithm = incremental + # dim InType128 multiplier = 1 + # dim InType128 divisor = 1 + # dim InType129 name = InType129 + # dim InType129 algorithm = incremental + # dim InType129 multiplier = 1 + # dim InType129 divisor = 1 + # dim InType136 name = InType136 + # dim InType136 algorithm = incremental + # dim InType136 multiplier = 1 + # dim InType136 divisor = 1 + # dim OutType1 name = OutType1 + # dim OutType1 algorithm = incremental + # dim OutType1 multiplier = -1 + # dim OutType1 divisor = 1 + # dim OutType128 name = OutType128 + # dim OutType128 algorithm = incremental + # dim OutType128 multiplier = -1 + # dim OutType128 divisor = 1 + # dim OutType129 name = OutType129 + # dim OutType129 algorithm = incremental + # dim OutType129 multiplier = -1 + # dim OutType129 divisor = 1 + # dim OutType133 name = OutType133 + # dim OutType133 algorithm = incremental + # dim OutType133 multiplier = -1 + # dim OutType133 divisor = 1 + # dim OutType135 name = OutType135 + # dim OutType135 algorithm = incremental + # dim OutType135 multiplier = -1 + # dim OutType135 divisor = 1 + # dim OutType143 name = OutType143 + # dim OutType143 algorithm = incremental + # dim OutType143 multiplier = -1 + # dim OutType143 divisor = 1 + +[ipv6.ect] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/ipv6.ect + # chart type = line + # type = ipv6 + # family = packets + # context = ipv6.ect + # units = packets/s + # priority = 10800 + # gap when lost iterations above = 1 + # name = ipv6.ect + # title = IPv6 ECT Packets (ipv6.ect) + # dim InNoECTPkts name = InNoECTPkts + # dim InNoECTPkts algorithm = incremental + # dim InNoECTPkts multiplier = 1 + # dim InNoECTPkts divisor = 1 + # dim InECT1Pkts name = InECT1Pkts + # dim InECT1Pkts algorithm = incremental + # dim InECT1Pkts multiplier = 1 + # dim InECT1Pkts divisor = 1 + # dim InECT0Pkts name = InECT0Pkts + # dim InECT0Pkts algorithm = incremental + # dim InECT0Pkts multiplier = 1 + # dim InECT0Pkts divisor = 1 + # dim InCEPkts name = InCEPkts + # dim InCEPkts algorithm = incremental + # dim InCEPkts multiplier = 1 + # dim InCEPkts divisor = 1 + +[nginx.requests] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/nginx.requests + # chart type = line + # type = nginx + # family = nginx + # context = nginx.requests + # units = requests/s + # priority = 60002 + # gap when lost iterations above = 1 + # name = nginx.requests + # title = nginx Requests (nginx.requests) + # dim requests name = requests + # dim requests algorithm = incremental + # dim requests multiplier = 1 + # dim requests divisor = 1 + +[nginx.connections_status] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/nginx.connections_status + # chart type = line + # type = nginx + # family = nginx + # context = nginx.connections.status + # units = connections + # priority = 60003 + # gap when lost iterations above = 1 + # name = nginx.connections_status + # title = nginx Active Connections by Status (nginx.connections_status) + # dim reading name = reading + # dim reading algorithm = absolute + # dim reading multiplier = 1 + # dim reading divisor = 1 + # dim writing name = writing + # dim writing algorithm = absolute + # dim writing multiplier = 1 + # dim writing divisor = 1 + # dim waiting name = idle + # dim waiting algorithm = absolute + # dim waiting multiplier = 1 + # dim waiting divisor = 1 + +[netfilter.sockets] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.sockets + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.sockets + # units = active connections + # priority = 1000 + # gap when lost iterations above = 1 + # name = netfilter.sockets + # title = Netfilter Connections (netfilter.sockets) + # dim connections name = connections + # dim connections algorithm = absolute + # dim connections multiplier = 1 + # dim connections divisor = 1 + +[nginx.connect_rate] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/nginx.connect_rate + # chart type = line + # type = nginx + # family = nginx + # context = nginx.connections.rate + # units = connections/s + # priority = 60004 + # gap when lost iterations above = 1 + # name = nginx.connect_rate + # title = nginx Connections Rate (nginx.connect_rate) + # dim accepts name = accepted + # dim accepts algorithm = incremental + # dim accepts multiplier = 1 + # dim accepts divisor = 1 + # dim handled name = handled + # dim handled algorithm = incremental + # dim handled multiplier = 1 + # dim handled divisor = 1 + +[netfilter.new] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.new + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.new + # units = connections/s + # priority = 1001 + # gap when lost iterations above = 1 + # name = netfilter.new + # title = Netfilter New Connections (netfilter.new) + # dim new name = new + # dim new algorithm = incremental + # dim new multiplier = 1 + # dim new divisor = 1 + # dim ignore name = ignore + # dim ignore algorithm = incremental + # dim ignore multiplier = -1 + # dim ignore divisor = 1 + # dim invalid name = invalid + # dim invalid algorithm = incremental + # dim invalid multiplier = -1 + # dim invalid divisor = 1 + +[netfilter.changes] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.changes + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.changes + # units = changes/s + # priority = 1002 + # gap when lost iterations above = 1 + # name = netfilter.changes + # title = Netfilter Connection Changes (netfilter.changes) + # dim inserted name = inserted + # dim inserted algorithm = incremental + # dim inserted multiplier = 1 + # dim inserted divisor = 1 + # dim deleted name = deleted + # dim deleted algorithm = incremental + # dim deleted multiplier = -1 + # dim deleted divisor = 1 + # dim delete_list name = delete_list + # dim delete_list algorithm = incremental + # dim delete_list multiplier = -1 + # dim delete_list divisor = 1 + +[netdata.plugin_chartsd_example] + # history = 86400 + # enabled = yes + enabled = yes + # cache directory = /var/cache/netdata/netdata.plugin_chartsd_example + # chart type = area + # type = netdata + # family = charts.d + # context = netdata.plugin_charts + # units = milliseconds / run + # priority = 145000 + # gap when lost iterations above = 1 + # name = netdata.plugin_chartsd_example + # title = Execution time for example plugin (netdata.plugin_chartsd_example) + # dim run_time name = run time + # dim run_time algorithm = absolute + # dim run_time multiplier = 1 + # dim run_time divisor = 1 + +[netdata.plugin_chartsd_mysql] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.plugin_chartsd_mysql + # chart type = area + # type = netdata + # family = charts.d + # context = netdata.plugin_charts + # units = milliseconds / run + # priority = 145000 + # gap when lost iterations above = 1 + # name = netdata.plugin_chartsd_mysql + # title = Execution time for mysql plugin (netdata.plugin_chartsd_mysql) + # dim run_time name = run time + # dim run_time algorithm = absolute + # dim run_time multiplier = 1 + # dim run_time divisor = 1 + +[netdata.plugin_chartsd_nginx] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.plugin_chartsd_nginx + # chart type = area + # type = netdata + # family = charts.d + # context = netdata.plugin_charts + # units = milliseconds / run + # priority = 145000 + # gap when lost iterations above = 1 + # name = netdata.plugin_chartsd_nginx + # title = Execution time for nginx plugin (netdata.plugin_chartsd_nginx) + # dim run_time name = run time + # dim run_time algorithm = absolute + # dim run_time multiplier = 1 + # dim run_time divisor = 1 + +[netfilter.expect] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.expect + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.expect + # units = expectations/s + # priority = 1003 + # gap when lost iterations above = 1 + # name = netfilter.expect + # title = Netfilter Connection Expectations (netfilter.expect) + # dim created name = created + # dim created algorithm = incremental + # dim created multiplier = 1 + # dim created divisor = 1 + # dim deleted name = deleted + # dim deleted algorithm = incremental + # dim deleted multiplier = -1 + # dim deleted divisor = 1 + # dim new name = new + # dim new algorithm = incremental + # dim new multiplier = 1 + # dim new divisor = 1 + +[netdata.plugin_chartsd_postfix] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netdata.plugin_chartsd_postfix + # chart type = area + # type = netdata + # family = charts.d + # context = netdata.plugin_charts + # units = milliseconds / run + # priority = 145000 + # gap when lost iterations above = 1 + # name = netdata.plugin_chartsd_postfix + # title = Execution time for postfix plugin (netdata.plugin_chartsd_postfix) + # dim run_time name = run time + # dim run_time algorithm = absolute + # dim run_time multiplier = 1 + # dim run_time divisor = 1 + +[netfilter.search] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.search + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.search + # units = searches/s + # priority = 1010 + # gap when lost iterations above = 1 + # name = netfilter.search + # title = Netfilter Connection Searches (netfilter.search) + # dim searched name = searched + # dim searched algorithm = incremental + # dim searched multiplier = 1 + # dim searched divisor = 1 + # dim restarted name = restarted + # dim restarted algorithm = incremental + # dim restarted multiplier = -1 + # dim restarted divisor = 1 + # dim found name = found + # dim found algorithm = incremental + # dim found multiplier = 1 + # dim found divisor = 1 + +[netfilter.errors] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/netfilter.errors + # chart type = line + # type = netfilter + # family = netfilter + # context = netfilter.errors + # units = events/s + # priority = 1005 + # gap when lost iterations above = 1 + # name = netfilter.errors + # title = Netfilter Errors (netfilter.errors) + # dim icmp_error name = icmp_error + # dim icmp_error algorithm = incremental + # dim icmp_error multiplier = 1 + # dim icmp_error divisor = 1 + # dim insert_failed name = insert_failed + # dim insert_failed algorithm = incremental + # dim insert_failed multiplier = -1 + # dim insert_failed divisor = 1 + # dim drop name = drop + # dim drop algorithm = incremental + # dim drop multiplier = -1 + # dim drop divisor = 1 + # dim early_drop name = early_drop + # dim early_drop algorithm = incremental + # dim early_drop multiplier = -1 + # dim early_drop divisor = 1 + +[mem.pgfaults] + # history = 86400 + # enabled = yes + enabled = no + # cache directory = /var/cache/netdata/mem.pgfaults + # chart type = line + # type = mem + # family = system + # context = mem.pgfaults + # units = page faults/s + # priority = 500 + # gap when lost iterations above = 1 + # name = mem.pgfaults + # title = Memory Page Faults (mem.pgfaults) + # dim minor name = minor + # dim minor algorithm = incremental + # dim minor multiplier = 1 + # dim minor divisor = 1 + # dim major name = major + # dim major algorithm = incremental + # dim major multiplier = -1 + # dim major divisor = 1 diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service new file mode 100644 index 000000000..b244d1866 --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata.service @@ -0,0 +1,13 @@ +[Unit] +Description=Netdata, Real-time performance monitoring +RequiresMountsFor=/var + +[Service] +User=root +ExecStartPre=/bin/mkdir -p /var/log/netdata +ExecStartPre=/bin/chown -R nobody.netdata @@datadir/netdata/web +ExecStartPre=/bin/chown -R nobody.netdata /var/cache/netdata +ExecStart=/usr/sbin/netdata -nd + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb new file mode 100644 index 000000000..317ddccaf --- /dev/null +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_git.bb @@ -0,0 +1,52 @@ +HOMEPAGE = "https://github.com/firehol/netdata/" +SUMMARY = "Real-time performance monitoring" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=747afe070ea9d6c2be0a31353609a35b" + +SRC_URI = "git://github.com/firehol/netdata.git;protocol=https" +SRCREV = "36c1304e37094174ea51001903058e65053107ca" + +# patch to disable timeout because timeout are not available with actual version +# of core-utils +SRC_URI += "file://0001-Correct-Timeout-issue.patch" + +# default netdata.conf for netdata configuration +SRC_URI += "file://netdata.conf" + +# file for providing systemd service support +SRC_URI += "file://netdata.service" + +S = "${WORKDIR}/git" + +inherit pkgconfig autotools useradd systemd + +#systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "netdata.service" +SYSTEMD_AUTO_ENABLE_${PN} = "enable" + +#User specific +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system netdata" + +do_install_append() { + #set S UID for plugins + chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system + sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + fi + + # Install default netdata.conf + install -d ${D}${sysconfdir}/netdata + install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/ + sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf + sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf +} + +FILES_${PN}-dbg += "${libexecdir}/netdata/plugins.d/.debug" +RDEPENDS_${PN} = "bash zlib" diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index a9ee40507..1ca1480c3 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -11,7 +11,7 @@ diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl index 57a37f7..838b944 100755 --- a/webmin/webmin-lib.pl +++ b/webmin/webmin-lib.pl -@@ -1059,18 +1059,19 @@ my %miniserv; +@@ -1086,28 +1086,28 @@ &load_theme_library(); # So that UI functions work # Need OS upgrade @@ -20,26 +20,46 @@ index 57a37f7..838b944 100755 - $realos{'os_type'} ne $gconfig{'os_type'}) && - $realos{'os_version'} && $realos{'os_type'} && - &foreign_available("webmin")) { -- push(@notifs, -- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -- &text('os_incorrect', $realos{'real_os_type'}, -- $realos{'real_os_version'})."<p>\n". -- &ui_form_end([ [ undef, $text{'os_fix'} ] ]) -- ); +- my ($realminor) = split(/\./, $realos{'os_version'}); +- my ($minor) = split(/\./, $gconfig{'os_version'}); +- if ($realos{'os_type'} eq $gconfig{'os_type'} && +- $realminor == $minor) { +- # Only the minor version number changed - no need to apply +- &apply_new_os_version(\%realos); +- } +- else { +- # Large enough change to tell the user +- push(@notifs, +- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). +- &text('os_incorrect', $realos{'real_os_type'}, +- $realos{'real_os_version'})."<p>\n". +- &ui_form_end([ [ undef, $text{'os_fix'} ] ]) +- ); +- } - } -+# Disabled for now as os-chooser.pl does not work on our system +#my %realos = &detect_operating_system(undef, 1); +#if (($realos{'os_version'} ne $gconfig{'os_version'} || +# $realos{'os_type'} ne $gconfig{'os_type'}) && +# $realos{'os_version'} && $realos{'os_type'} && +# &foreign_available("webmin")) { -+# push(@notifs, -+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -+# &text('os_incorrect', $realos{'real_os_type'}, -+# $realos{'real_os_version'})."<p>\n". -+# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) -+# ); ++# my ($realminor) = split(/\./, $realos{'os_version'}); ++# my ($minor) = split(/\./, $gconfig{'os_version'}); ++# if ($realos{'os_type'} eq $gconfig{'os_type'} && ++# $realminor == $minor) { ++# # Only the minor version number changed - no need to apply ++# &apply_new_os_version(\%realos); ++# } ++# else { ++# # Large enough change to tell the user ++# push(@notifs, ++# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). ++# &text('os_incorrect', $realos{'real_os_type'}, ++# $realos{'real_os_version'})."<p>\n". ++# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) ++# ); ++# } +# } # Password close to expiry my $warn_days = $config{'warn_days'}; + diff --git a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb index 34052a147..d96c0f2bc 100644 --- a/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb +++ b/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb @@ -20,8 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://mysql-config-fix.patch \ " -SRC_URI[md5sum] = "4007c390323d840f26c2e0f43c5c81a3" -SRC_URI[sha256sum] = "5111f820adc6fbca997a58d4b2fa186dac6cded9cff0e70724f8cae6021123d9" +SRC_URI[md5sum] = "91d05b4e31ad1bd14bab14e0f155c088" +SRC_URI[sha256sum] = "ad477edb41dc1a900448afc8b5528e136b3778d2d303f23bc564afb975eb5bed" inherit perlnative update-rc.d @@ -109,6 +109,9 @@ do_install() { export no_pam=1 mkdir -p $tempdir ${S}/../setup.sh + + # Ensure correct PERLLIB path + sed -i -e 's#${D}##g' ${D}${sysconfdir}/webmin/start } INITSCRIPT_NAME = "webmin" |
