[07/12] ltq-vdsl-app: use ubus to provide metrics

Message ID	20201215093531.1763475-8-a.heider@gmail.com
State	Superseded
Headers	show Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> From: Andre Heider <a.heider@gmail.com> To: openwrt-devel@lists.openwrt.org Subject: [PATCH 07/12] ltq-vdsl-app: use ubus to provide metrics Date: Tue, 15 Dec 2020 10:35:26 +0100 Message-Id: <20201215093531.1763475-8-a.heider@gmail.com> In-Reply-To: <20201215093531.1763475-1-a.heider@gmail.com> References: <20201215093531.1763475-1-a.heider@gmail.com> MIME-Version: 1.0 summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [a.heider[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Precedence: list Cc: Martin Schiller <ms@dev.tdt.de> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
Series	add ubus support to ltq-[v\|a]dsl-app \| expand [v2,0/12] add ubus support to ltq-[v\|a]dsl-app [01/12] ltq-vdsl-app: shutdown upon sigterm [02/12] ltq-vdsl-app: add ubus support to get metrics [03/12] ltq-adsl-app: add ubus support to get metrics [luci,04/12] luci-mod-status: use the new ubus dsl metrics [luci,05/12] rpcd-mod-luci: get rid of now unused getDSLStatus ubus rpc [packages,06/12] prometheus-node-exporter-lua: use the new ubus dsl metrics [07/12] ltq-vdsl-app: use ubus to provide metrics [08/12] ltq-adsl-app: use ubus to provide metrics [09/12] ltq-dsl-base: remove usused lantiq_dsl.sh [10/12] ltq-dsl-base: bump PKG_RELEASE [11/12] ltq-vdsl-app: bump PKG_RELEASE [12/12] ltq-adsl-app: bump PKG_RELEASE

Message ID

20201215093531.1763475-8-a.heider@gmail.com

State

Superseded

Headers

From: Andre Heider <a.heider@gmail.com>
To: openwrt-devel@lists.openwrt.org
Subject: [PATCH 07/12] ltq-vdsl-app: use ubus to provide metrics
Date: Tue, 15 Dec 2020 10:35:26 +0100
Message-Id: <20201215093531.1763475-8-a.heider@gmail.com>
In-Reply-To: <20201215093531.1763475-1-a.heider@gmail.com>
References: <20201215093531.1763475-1-a.heider@gmail.com>
MIME-Version: 1.0
Precedence: list
Cc: Martin Schiller <ms@dev.tdt.de>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
Errors-To: 
 openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org

Series

add ubus support to ltq-[v|a]dsl-app | expand

Commit Message

Andre Heider Dec. 15, 2020, 9:35 a.m. UTC

luci now uses ubus directly, so remove 'lucistat'.
For manual usage just print the ubus output, use luci for a pretty
version.

Signed-off-by: Andre Heider <a.heider@gmail.com>
Tested-by: Martin Schiller <ms@dev.tdt.de>
---
 package/network/config/ltq-vdsl-app/files/dsl_control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index 5089d7ac31..54b739e2cd 100644
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -4,10 +4,11 @@ 
 START=97
 USE_PROCD=1
 
-extra_command "dslstat" "Get DSL status information"
-extra_command "lucistat" "Get status information in lua friendly format"
+dslstat() {
+	ubus call dsl metrics
+}
 
-. /lib/functions/lantiq_dsl.sh
+extra_command "dslstat" "Get DSL status information"
 
 #
 # ITU-T G.997.1 (06/2012) - Section 7.3.1.1.1 (xTU transmission system enabling (XTSE))

[07/12] ltq-vdsl-app: use ubus to provide metrics

Commit Message

Patch