From fd3608eba4a76ec7818e06ca1bb1eda0b7980353 Mon Sep 17 00:00:00 2001
From: mirackle-spb <root@consult-it.pro>
Date: Tue, 25 Jul 2023 12:25:12 +0300
Subject: [PATCH] Dlink - fixed prompt for other dlink switches, added
 additional uptime removal expressions (#2794)

---
 CHANGELOG.md                | 1 +
 lib/oxidized/model/dlink.rb | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e014b5fa..fe3583ac6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 + Documentation to send mail with hooks
 
 ## Changed
+- dlink: fixed prompt for other dlink switches, added additional uptime removal expressions (@mirackle-spb)
 
 ## Fixed
 
diff --git a/lib/oxidized/model/dlink.rb b/lib/oxidized/model/dlink.rb
index f5d319a6e..da3f60970 100644
--- a/lib/oxidized/model/dlink.rb
+++ b/lib/oxidized/model/dlink.rb
@@ -2,9 +2,8 @@ class Dlink < Oxidized::Model
   using Refinements
 
   # D-LINK Switches
-  # Add support dgs 1100 series (tested only with dgs-1100-10/me)
 
-  prompt /^(\r*[\w\s.@()\/:-]+[#>]\s?)$/
+  prompt /[\w.@()\/:-]+[#>]\s?$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -19,6 +18,9 @@ class Dlink < Oxidized::Model
 
   cmd 'show switch' do |cfg|
     cfg.gsub! /^System Uptime\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System up time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System Time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^RTC Time\s.+/, '' # Omit constantly changing uptime info
     comment cfg
   end