Merge branch 'master' into rstrip-procurve

Author: thanegill

.github/workflows/ruby.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', 'ruby-head']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
     continue-on-error: ${{ matrix.ruby-version == 'ruby-head' }}
 
     steps:

CHANGELOG.md

@@ -16,6 +16,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Fixed
 - procurve: hide the SNMP community on `snmp-server host <ip> community "<name>"` lines (@thanegill)
 - procurve: hide local user password hashes (`password ... sha1 "<hash>"`) when remove_secret is true (@thanegill)
+- source/sql: support defining port in configuration. Closes #3853 (@ytti)
+
+### Changed
+- docker: set LANG=C.UTF-8. Fixes #3690 (@ytti)
+
+### Fixed
+- siklu: allow parenthesis in prompt. Fixes #3841 (@ytti)
+- fortios: allow parenthesis in prompt. Fixes #3846 (@ytti)
+- fortigate: prompt can contain HA cluster status. Fixes #3846 (@robertcheramy)
 
 ## [0.37.0 - 2026-05-20]
 ### Added

Dockerfile

@@ -1,5 +1,7 @@
 FROM docker.io/debian:trixie-slim
 
+ENV LANG=C.UTF-8
+
 ##### Place "static" commands at the beginning to optimize image size and build speed
 
 # add non-privileged user

lib/oxidized/model/fortigate.rb

@@ -3,8 +3,14 @@ class FortiGate < Oxidized::Model
 
   comment '# '
 
-  prompt /^(\(\w\) )?([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
-
+  prompt(/
+    ^
+    (?:\(\w\)\ )?          # optional status indicator, e.g. "(M) "
+    [-\w.~]+               # hostname
+    (?:\((?:\w+)\))?       # optional HA cluster status (Primary|Secondary)
+    (?:\ [(\w\-.)]+)?      # optional VDOM
+    ~?\ ?[#>$]\ ?$         # End of prompt
+  /x)
   # When a post-login-banner is enabled, you have to press "a" to log in
   expect /^\(Press\s'a'\sto\saccept\):/ do |data, re|
     send 'a'

lib/oxidized/model/fortios.rb

@@ -3,7 +3,7 @@ class FortiOS < Oxidized::Model
 
   comment '# '
 
-  prompt /^(\(\w\) )?([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
+  prompt /^(\(\w\) )?([-\w.~()]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
 
   # When a post-login-banner is enabled, you have to press "a" to log in
   expect /^\(Press\s'a'\sto\saccept\):/ do |data, re|

lib/oxidized/model/siklu.rb

@@ -3,7 +3,7 @@ class Siklu < Oxidized::Model
 
   # Siklu EtherHaul #
 
-  prompt /^[\^M\s]{0,}[\w\-\s."]+>$/
+  prompt /^[\^M\s]{0,}[\w\-\s."()]+>$/
 
   cmd 'copy startup-configuration display' do |cfg|
     cfg.each_line.to_a[2..2].join

lib/oxidized/source/sql.rb

@@ -68,6 +68,7 @@ def connect
         options = {
           adapter:  @cfg.adapter,
           host:     @cfg.host?,
+          port:     @cfg.port?,
           user:     @cfg.user?,
           password: @cfg.password?,
           database: @cfg.database,

spec/model/data/fortigate#generic#prompt.yaml

@@ -6,3 +6,7 @@ pass:
   # FortiOS
   - 'oxidized-Firewall123 # '
   - 'OXI-FW121 (global) # '
+  # Issue #3846
+  - 'hostname(Primary) # '
+  - 'hostname(Primary) (global) # '
+

spec/model/data/fortios#generic#prompt.yaml

@@ -0,0 +1,3 @@
+pass:
+  # Issue #3846
+  - 'hostname(Primary) #'

spec/model/data/siklu#generic#prompt.yaml

@@ -0,0 +1,3 @@
+pass:
+  # Issue #3841
+  - '111Cedar-NYArtCenter_(111)>'