Skip to content

Fix sort agents by status#810

Merged
jesuslinares merged 3 commits into3.4from
fix-sort-agents
Jul 3, 2018
Merged

Fix sort agents by status#810
jesuslinares merged 3 commits into3.4from
fix-sort-agents

Conversation

@Lifka
Copy link
Copy Markdown
Contributor

@Lifka Lifka commented Jun 19, 2018

Hi team,

this PR fixes the issue wazuh/wazuh-api#111.

Before:

$ curl -u foo:bar -k "http://127.0.0.1:55000/agents?pretty&sort=status&select=id,status"
{
   "error": 0,
   "data": {
      "totalItems": 6,
      "items": [
         {
            "status": "Active",
            "version": "Wazuh v3.3.1",
            "id": "000",
            "lastKeepAlive": "9999-12-31 23:59:59"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "001",
            "lastKeepAlive": "2018-06-19 09:32:47"
         },
         {
            "status": "Never connected",
            "id": "002"
         },
         {
            "status": "Never connected",
            "id": "003"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "004",
            "lastKeepAlive": "2018-06-18 09:36:22"
         },
         {
            "status": "Never connected",
            "id": "005"
         }
      ]
   }
}

$ curl -u foo:bar -k "http://127.0.0.1:55000/agents?pretty&sort=-status&select=id,status"
{
   "error": 0,
   "data": {
      "totalItems": 6,
      "items": [
         {
            "status": "Never connected",
            "id": "002"
         },
         {
            "status": "Never connected",
            "id": "003"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "004",
            "lastKeepAlive": "2018-06-18 09:36:22"
         },
         {
            "status": "Never connected",
            "id": "005"
         },
         {
            "status": "Active",
            "version": "Wazuh v3.3.1",
            "id": "000",
            "lastKeepAlive": "9999-12-31 23:59:59"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "001",
            "lastKeepAlive": "2018-06-19 09:32:47"
         }
      ]
   }
}

Now:

$ curl -u foo:bar -k "http://127.0.0.1:55000/agents?pretty&sort=status&select=id,status"
{
   "error": 0,
   "data": {
      "totalItems": 6,
      "items": [
         {
            "status": "Active",
            "version": "Wazuh v3.3.1",
            "id": "000",
            "lastKeepAlive": "9999-12-31 23:59:59"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "001",
            "lastKeepAlive": "2018-06-19 09:32:47"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "004",
            "lastKeepAlive": "2018-06-18 09:36:22"
         },
         {
            "status": "Never connected",
            "id": "002"
         },
         {
            "status": "Never connected",
            "id": "003"
         },
         {
            "status": "Never connected",
            "id": "005"
         }
      ]
   }
}

$ curl -u foo:bar -k "http://127.0.0.1:55000/agents?pretty&sort=-status&select=id,status"
{
   "error": 0,
   "data": {
      "totalItems": 6,
      "items": [
         {
            "status": "Never connected",
            "id": "002"
         },
         {
            "status": "Never connected",
            "id": "003"
         },
         {
            "status": "Never connected",
            "id": "005"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "004",
            "lastKeepAlive": "2018-06-18 09:36:22"
         },
         {
            "status": "Disconnected",
            "version": "Wazuh v3.3.1",
            "id": "001",
            "lastKeepAlive": "2018-06-19 09:32:47"
         },
         {
            "status": "Active",
            "version": "Wazuh v3.3.1",
            "id": "000",
            "lastKeepAlive": "9999-12-31 23:59:59"
         }
      ]
   }
}

Regards!

@Lifka Lifka added type/bug Something isn't working module/framework labels Jun 19, 2018
@Lifka Lifka requested a review from mgmacias95 June 19, 2018 11:04
@jesuslinares jesuslinares changed the base branch from 3.3 to 3.4 July 3, 2018 11:32
@jesuslinares jesuslinares merged commit b1f33f7 into 3.4 Jul 3, 2018
@jesuslinares jesuslinares deleted the fix-sort-agents branch July 3, 2018 11:33
Darioortegaleyva pushed a commit that referenced this pull request Feb 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

module/framework type/bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants