Skip to content

Commit

Permalink
aoscx: Fix fan RPM speeds included in environment output
Browse files Browse the repository at this point in the history
Build on the work by vppencilsharpener and steveneppler

Fixes #2864
  • Loading branch information
danpoltawski committed Jul 12, 2023
1 parent dab52d0 commit 7b1f9a9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- fixed new date/time format with newer RouterOS `# jun/01/2023 12:11:25 by RouterOS 7.9.1` vs `# 2023-06-01 12:16:16 by RouterOS 7.10rc1` (@tim427)
- fixed netscaler backups with hostname set #2828 (@electrocret)
- Do not redirect stderr when fetching opnsense version since default shell (csh) doesn't support it (@spike77453)
- Fixed fan RPM speeds included in Aruba CX diffs (@danpoltawski)


## [0.29.1 - 2023-04-24]
Expand Down
2 changes: 2 additions & 0 deletions lib/oxidized/model/aoscx.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class Aoscx < Oxidized::Model
cfg.gsub! /^(\d\/\d\/\d.*\s+)\d+\s+$/, '\\1<hidden>'
cfg.gsub! /^(\d+\/\S+\s+\S+\s+)\d+\.\d+\s+C(.*)/, '\\1<hidden>\\2'
cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
cfg.gsub! /^(Tray-\d+\/\S+\s+\S+\s+\S+\s+)(\S+)(\s+\S+\s+\S+\s+)\d+/,'\\1<speed>\\3<rpm>'

Check warning on line 61 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.0)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:61:73: C: Layout/SpaceAfterComma: Space missing after comma.

Check warning on line 61 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.1)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:61:73: C: Layout/SpaceAfterComma: Space missing after comma.

Check warning on line 61 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.2)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:61:73: C: Layout/SpaceAfterComma: Space missing after comma.
cfg.gsub! /^(System-\d+\/\S+\s+\S+\s+\S+\s+)(\S+)(\s+\S+\s+\S+\s+)\d+/,'\\1<speed>\\3<rpm>'

Check warning on line 62 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.0)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:62:75: C: Layout/SpaceAfterComma: Space missing after comma.

Check warning on line 62 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.1)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:62:75: C: Layout/SpaceAfterComma: Space missing after comma.

Check warning on line 62 in lib/oxidized/model/aoscx.rb

View workflow job for this annotation

GitHub Actions / test (3.2)

[rubocop] reported by reviewdog 🐶 Space missing after comma. Raw Output: lib/oxidized/model/aoscx.rb:62:75: C: Layout/SpaceAfterComma: Space missing after comma.
comment cfg
end

Expand Down

0 comments on commit 7b1f9a9

Please sign in to comment.