Skip to content

Commit

Permalink
Backport 4851 to 4.4 7.16 (#4864)
Browse files Browse the repository at this point in the history
* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)
  • Loading branch information
chantal-kelm authored Nov 14, 2022
1 parent 2aacb81 commit cd405d2
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ All notable changes to the Wazuh app project will be documented in this file.
- Updated and added operating systems, versions, architectures commands of Install and enroll the agent and
commands of Start the agent in the deploy new agent section [#4458](https://github.com/wazuh/wazuh-kibana-app/pull/4458)
- Makes Agents Overview loading icons independent [#4363](https://github.com/wazuh/wazuh-kibana-app/pull/4363)
- Added cluster's IP and protocol as suggestions in the agent deployment wizard. [#4776](https://github.com/wazuh/wazuh-kibana-app/pull/4776)
- Show OS name and OS version in the agent installation wizard. [#4851](https://github.com/wazuh/wazuh-kibana-app/pull/4851)

### Fixed

Expand Down
30 changes: 15 additions & 15 deletions public/controllers/agent/wazuh-config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const versionButtonsDebian = [
const versionButtonFedora = [
{
id: '22',
label: '22 or later'
label: 'Fedora 22 or later'
}
]

Expand Down Expand Up @@ -206,45 +206,45 @@ const versionButtonsWindows = [
const versionButtonsSuse = [
{
id: 'suse11',
label: '11',
label: 'SUSE 11',
},
{
id: 'suse12',
label: '12',
label: 'SUSE 12',
}
];

const versionButtonsMacOS = [
{
id: 'sierra',
label: 'Sierra',
label: 'macOS Sierra',
},
{
id: 'highSierra',
label: 'High Sierra',
label: 'macOS High Sierra',
},
{
id: 'mojave',
label: 'Mojave',
label: 'macOS Mojave',
},
{
id: 'catalina',
label: 'Catalina',
label: 'macOS Catalina',
},
{
id: 'bigSur',
label: 'Big Sur',
label: 'macOS Big Sur',
},
{
id: 'monterrey',
label: 'Monterrey',
label: 'macOS Monterrey',
},
];

const versionButtonsOpenSuse = [
{
id: 'leap15',
label: 'Leap 15 or higher',
label: 'OpenSuse Leap 15 or higher',
}
];

Expand All @@ -262,32 +262,32 @@ const versionButtonsSolaris = [
const versionButtonsAix = [
{
id: '6.1 TL9',
label: '6.1 TL9 or higher',
label: 'AIX 6.1 TL9 or higher',
}
];

const versionButtonsHPUX = [
{
id: '11.31',
label: '11.31 or higher',
label: 'HP-UX 11.31 or higher',
}
];

const versionButtonsOracleLinux = [
{
id: 'oraclelinux5',
label: '5',
label: 'Oracle Linux 5',
},
{
id: 'oraclelinux6',
label: '6 or later',
label: 'Oracle Linux 6 or later',
}
];

const versionButtonsRaspbian = [
{
id: 'busterorgreater',
label: 'Buster or greater',
label: 'Raspbian Buster or greater',
}
];

Expand Down

0 comments on commit cd405d2

Please sign in to comment.