From c9b7e1f031457f485d5e6b453d82b0b07b366f2d Mon Sep 17 00:00:00 2001 From: Frederik Kriewitz Date: Wed, 15 Nov 2023 15:54:55 +0100 Subject: [PATCH 1/2] edgecos: improve system temperature removal Latest software version has some formaing changes (extra spaces). The updated regex will work for all software versions. --- lib/oxidized/model/edgecos.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/oxidized/model/edgecos.rb b/lib/oxidized/model/edgecos.rb index b4506f5e9..43eb6cd8f 100644 --- a/lib/oxidized/model/edgecos.rb +++ b/lib/oxidized/model/edgecos.rb @@ -31,7 +31,7 @@ class EdgeCOS < Oxidized::Model cmd 'show system' do |cfg| cfg.gsub! /^.*\sUp Time\s*:.*\n/i, '' - cfg.gsub! /^(.*\sTemperature \d*:).*\n/i, '\\1 ' + cfg.gsub! /^(.*\sTemperature \d*\s*:\s*).*/i, '\\1' comment cfg end From 59b5ac7c7d07e1ead61969158cc16cacadc10941 Mon Sep 17 00:00:00 2001 From: Frederik Kriewitz Date: Wed, 15 Nov 2023 15:57:46 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f90e029f3..d6095a2b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). - iosxr: include last config changed by in model (@electrocret) - panos: exclude device dictionary - Added support for Nokia SAR 7705 HMC in SROS model (@schouwenburg) +- edgecos: improve system temperature removal ## Fixed - fixed empty lines for ZyXEL GS1900 switches (@jluebbe)