Skip to content

Commit

Permalink
Merge branch 'main' into 1122-User-LdapPerson-Asure-AD-support
Browse files Browse the repository at this point in the history
  • Loading branch information
PavelJurka authored Jul 27, 2024
2 parents 64b2d2e + e651e9d commit 669339a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@ Thankyou! -->
7. Added `vendor_name`, `type`, `type_id` to object `package`. #1093
8. Added `router`, `ids`, and `ips` entries to `type_id` enum in the `Endpoint` object. #1121
9. Added `job` to `Evidence Artifacts` object. #1130
10. Added `cpe_name` and `hash` to `Software Package` object. #1142
11. Added `avg_timespan` to the `kb_article` object. #1125
10. Added `ip` to object `load_balancer`. #1138
11. Added `cpe_name` and `hash` to `Software Package` object. #1142
12. Added `avg_timespan` to the `kb_article` object. #1125
* #### Platform Extensions

### Bugfixes
Expand Down
4 changes: 4 additions & 0 deletions objects/endpoint.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@
"14": {
"caption": "IPS",
"description": "An <a target='_blank' href='https://d3fend.mitre.org/dao/artifact/d3f:IntrusionPreventionSystem/'>intrusion prevention system</a>."
},
"15": {
"caption": "Load Balancer",
"description": "A <a target='_blank' href='https://en.wikipedia.org/wiki/Load_balancing_(computing)'> Load Balancer device."
}
},
"requirement": "recommended"
Expand Down
6 changes: 5 additions & 1 deletion objects/load_balancer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
"caption": "Classification",
"description": "The request classification as defined by the load balancer.",
"requirement": "optional"
},
},
"ip": {
"description": "The IP address of the load balancer node that handled the client request. Note: the load balancer may have other IP addresses, and this is not an IP address of the target/distribution endpoint - see <code>dst_endpoint</code>.",
"requirement": "optional"
},
"status_detail": {
"caption": "Status Detail",
"description": "The status detail contains additional status information about the load balancer distribution event.",
Expand Down

0 comments on commit 669339a

Please sign in to comment.