Adding upstream version 1.36.0.upstream/1.36.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 0 insertions, 296 deletions

diff --git a/collectors/python.d.plugin/ovpn_status_log/Makefile.inc b/collectors/python.d.plugin/ovpn_status_log/Makefile.inc
deleted file mode 100644
index 1fbc506d6..000000000
--- a/collectors/python.d.plugin/ovpn_status_log/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# THIS IS NOT A COMPLETE Makefile
-# IT IS INCLUDED BY ITS PARENT'S Makefile.am
-# IT IS REQUIRED TO REFERENCE ALL FILES RELATIVE TO THE PARENT
-
-# install these files
-dist_python_DATA       += ovpn_status_log/ovpn_status_log.chart.py
-dist_pythonconfig_DATA += ovpn_status_log/ovpn_status_log.conf
-
-# do not install these files, but include them in the distribution
-dist_noinst_DATA       += ovpn_status_log/README.md ovpn_status_log/Makefile.inc
-
diff --git a/collectors/python.d.plugin/ovpn_status_log/README.md b/collectors/python.d.plugin/ovpn_status_log/README.md
deleted file mode 100644
index 374d1910e..000000000
--- a/collectors/python.d.plugin/ovpn_status_log/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-title: "OpenVPN monitoring with Netdata"
-custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/python.d.plugin/ovpn_status_log/README.md
-sidebar_label: "OpenVPN"
--->
-
-# OpenVPN monitoring with Netdata
-
-Parses server log files and provides summary (client, traffic) metrics.
-
-## Requirements
-
--   If you are running multiple OpenVPN instances out of the same directory, MAKE SURE TO EDIT DIRECTIVES which create output files
-    so that multiple instances do not overwrite each other's output files.
-
--   Make sure NETDATA USER CAN READ openvpn-status.log
-
--   Update_every interval MUST MATCH interval on which OpenVPN writes operational status to log file.
-
-It produces:
-
-1.  **Users** OpenVPN active users
-
-    -   users
-
-2.  **Traffic** OpenVPN overall bandwidth usage in kilobit/s
-
-    -   in
-    -   out
-
-## Configuration
-
-Edit the `python.d/ovpn_status_log.conf` configuration file using `edit-config` from the Netdata [config
-directory](/docs/configure/nodes.md), which is typically at `/etc/netdata`.
-
-```bash
-cd /etc/netdata   # Replace this path with your Netdata config directory, if different
-sudo ./edit-config python.d/ovpn_status_log.conf
-```
-
-Sample:
-
-```yaml
-default
- log_path     : '/var/log/openvpn-status.log'
-```
-
----
-
-
diff --git a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
deleted file mode 100644
index cfc87be36..000000000
--- a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: utf-8 -*-
-# Description: openvpn status log netdata python.d module
-# Author: ilyam8
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import re
-
-from bases.FrameworkServices.SimpleService import SimpleService
-
-update_every = 10
-
-ORDER = [
-    'users',
-    'traffic',
-]
-
-CHARTS = {
-    'users': {
-        'options': [None, 'OpenVPN Active Users', 'active users', 'users', 'openvpn_status.users', 'line'],
-        'lines': [
-            ['users', None, 'absolute'],
-        ]
-    },
-    'traffic': {
-        'options': [None, 'OpenVPN Traffic', 'KiB/s', 'traffic', 'openvpn_status.traffic', 'area'],
-        'lines': [
-            ['bytes_in', 'in', 'incremental', 1, 1 << 10],
-            ['bytes_out', 'out', 'incremental', -1, 1 << 10]
-        ]
-    }
-}
-
-TLS_REGEX = re.compile(
-    r'(?:[0-9a-f]+:[0-9a-f:]+|(?:\d{1,3}(?:\.\d{1,3}){3}(?::\d+)?)) (?P<bytes_in>\d+) (?P<bytes_out>\d+)'
-)
-STATIC_KEY_REGEX = re.compile(
-    r'TCP/[A-Z]+ (?P<direction>(?:read|write)) bytes,(?P<bytes>\d+)'
-)
-
-
-class Service(SimpleService):
-    def __init__(self, configuration=None, name=None):
-        SimpleService.__init__(self, configuration=configuration, name=name)
-        self.order = ORDER
-        self.definitions = CHARTS
-        self.log_path = self.configuration.get('log_path')
-        self.regex = {
-            'tls': TLS_REGEX,
-            'static_key': STATIC_KEY_REGEX
-        }
-
-    def check(self):
-        if not (self.log_path and isinstance(self.log_path, str)):
-            self.error("'log_path' is not defined")
-            return False
-
-        data = self._get_raw_data()
-        if not data:
-            self.error('Make sure that the openvpn status log file exists and netdata has permission to read it')
-            return None
-
-        found = None
-        for row in data:
-            if 'ROUTING' in row:
-                self.get_data = self.get_data_tls
-                found = True
-                break
-            elif 'STATISTICS' in row:
-                self.get_data = self.get_data_static_key
-                found = True
-                break
-        if found:
-            return True
-        self.error('Failed to parse openvpn log file')
-        return False
-
-    def _get_raw_data(self):
-        """
-        Open log file
-        :return: str
-        """
-
-        try:
-            with open(self.log_path) as log:
-                raw_data = log.readlines() or None
-        except OSError:
-            return None
-        else:
-            return raw_data
-
-    def get_data_static_key(self):
-        """
-        Parse openvpn-status log file.
-        """
-
-        raw_data = self._get_raw_data()
-        if not raw_data:
-            return None
-
-        data = dict(bytes_in=0, bytes_out=0)
-
-        for row in raw_data:
-            match = self.regex['static_key'].search(row)
-            if match:
-                match = match.groupdict()
-                if match['direction'] == 'read':
-                    data['bytes_in'] += int(match['bytes'])
-                else:
-                    data['bytes_out'] += int(match['bytes'])
-
-        return data or None
-
-    def get_data_tls(self):
-        """
-        Parse openvpn-status log file.
-        """
-
-        raw_data = self._get_raw_data()
-        if not raw_data:
-            return None
-
-        data = dict(users=0, bytes_in=0, bytes_out=0)
-        for row in raw_data:
-            columns = row.split(',') if ',' in row else row.split()
-            if 'UNDEF' in columns:
-                # see https://openvpn.net/archive/openvpn-users/2004-08/msg00116.html
-                continue
-
-            match = self.regex['tls'].search(' '.join(columns))
-            if match:
-                match = match.groupdict()
-                data['users'] += 1
-                data['bytes_in'] += int(match['bytes_in'])
-                data['bytes_out'] += int(match['bytes_out'])
-
-        return data or None
diff --git a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf
deleted file mode 100644
index 1d71f6b8e..000000000
--- a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf
+++ /dev/null
@@ -1,97 +0,0 @@
-# netdata python.d.plugin configuration for openvpn status log
-#
-# This file is in YaML format. Generally the format is:
-#
-# name: value
-#
-# There are 2 sections:
-#  - global variables
-#  - one or more JOBS
-#
-# JOBS allow you to collect values from multiple sources.
-# Each source will have its own set of charts.
-#
-# JOB parameters have to be indented (using spaces only, example below).
-
-# ----------------------------------------------------------------------
-# Global Variables
-# These variables set the defaults for all JOBs, however each JOB
-# may define its own, overriding the defaults.
-
-# update_every sets the default data collection frequency.
-# If unset, the python.d.plugin default is used.
-# update_every: 1
-
-# priority controls the order of charts at the netdata dashboard.
-# Lower numbers move the charts towards the top of the page.
-# If unset, the default for python.d.plugin is used.
-# priority: 60000
-
-# penalty indicates whether to apply penalty to update_every in case of failures.
-# Penalty will increase every 5 failed updates in a row. Maximum penalty is 10 minutes.
-# penalty: yes
-
-# autodetection_retry sets the job re-check interval in seconds.
-# The job is not deleted if check fails.
-# Attempts to start the job are made once every autodetection_retry.
-# This feature is disabled by default.
-# autodetection_retry: 0
-
-# ----------------------------------------------------------------------
-# JOBS (data collection sources)
-#
-# The default JOBS share the same *name*. JOBS with the same name
-# are mutually exclusive. Only one of them will be allowed running at
-# any time. This allows autodetection to try several alternatives and
-# pick the one that works.
-#
-# Any number of jobs is supported.
-#
-# All python.d.plugin JOBS (for all its modules) support a set of
-# predefined parameters. These are:
-#
-# job_name:
-#     name: myname            # the JOB's name as it will appear at the
-#                             # dashboard (by default is the job_name)
-#                             # JOBs sharing a name are mutually exclusive
-#     update_every: 1         # the JOB's data collection frequency
-#     priority: 60000         # the JOB's order on the dashboard
-#     penalty: yes            # the JOB's penalty
-#     autodetection_retry: 0  # the JOB's re-check interval in seconds
-#
-# Additionally to the above, openvpn status log also supports the following:
-#
-#     log_path: 'PATH'     # the path to openvpn status log file
-#
-# ----------------------------------------------------------------------
-# AUTO-DETECTION JOBS
-# only one of them will run (they have the same name)
-#
-# IMPORTANT information
-#
-# 1. If you are running multiple OpenVPN instances out of the same directory, MAKE SURE TO EDIT DIRECTIVES which create output files
-# so that multiple instances do not overwrite each other's output files.
-# 2. Make sure NETDATA USER CAN READ openvpn-status.log
-#
-#     * cd into directory with openvpn-status.log and run the following commands as root 
-#     * #chown :netdata openvpn-status.log && chmod 640 openvpn-status.log
-#     * To check permission and group membership run
-#     * #ls -l openvpn-status.log
-#     -rw-r----- 1 root netdata 359 dec 21 21:22 openvpn-status.log
-#
-# 3. Update_every interval MUST MATCH interval on which OpenVPN writes operational status to log file.
-# If its not true traffic chart WILL DISPLAY WRONG values
-#
-# Default OpenVPN update interval is 10 second on Debian 8
-# # ps -C openvpn -o command=
-#       /usr/sbin/openvpn --daemon ovpn-server --status /run/openvpn/server.status 10 --cd /etc/openvpn --config /etc/openvpn/server.conf
-# 
-# 4. Confirm status is configured in your OpenVPN configuration.
-#     * Open OpenVPN config in an editor (e.g. sudo nano /etc/openvpn/default.conf)
-#     * Confirm status is enabled with below:
-#     status /var/log/openvpn-status.log
-#
-#default:
-# log_path: '/var/log/openvpn-status.log'
-#
-# ----------------------------------------------------------------------