Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set manager to "chef" on chef managed nodes #3840

Merged
merged 16 commits into from
Jun 2, 2020
Merged

set manager to "chef" on chef managed nodes #3840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
33f602b
ingest infra reports before inspec reports
May 10, 2020
b6ef93b
add manager type to interservice proto
May 10, 2020
aed91d7
ensure resolver includes manager type field
May 10, 2020
29a2527
put manager type on message to nodemanager
May 10, 2020
f99f14d
mgr type
May 22, 2020
403584c
expand allowed manager types
May 22, 2020
7870f21
ensure we do not allow update of name or tags of chef node
May 22, 2020
141985f
remove mgrtype lookup from process node code
May 22, 2020
5bb25dc
ui: only get automate and node integration associated nodes
May 22, 2020
33a7af3
test updates
May 22, 2020
0bdbf00
cleanup
May 22, 2020
9af7025
add cypress api test
May 29, 2020
c8943b1
lint fix
May 29, 2020
ab66e5e
expand allowed manager filter types; remove extra func
May 29, 2020
64e1a05
set default sort for nodes list to last_contact
May 30, 2020
c8e93c4
warn if mgr field is empty
Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .studio/compliance-service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ document "load_compliance_reports" <<DOC
Loads compliance report.
DOC
function load_compliance_reports() {
pushd components/compliance-service/test_data/audit_reports &> /dev/null
./send_to_data_collector.sh https://a2-dev.test "$(get_admin_token)"
popd &> /dev/null
generate_chef_run_example | jq '.entity_uuid = "34cbbb4c-c502-4971-b193-00e987b4678c"' | jq '.node_name = "debian(2)-zeta-linux(f)-apache(p)-failed"' | send_chef_data_raw
generate_chef_run_failure_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e149"' | jq '.node_name = "centos-beta"' | send_chef_data_raw
generate_chef_run_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e112"' | jq '.node_name = "redhat(2)-alpha-nginx(f)-apache(f)-failed"' | send_chef_data_raw
Expand All @@ -105,6 +102,9 @@ function load_compliance_reports() {
generate_chef_run_failure_example | jq '.entity_uuid = "9b9f4e51-b049-4b10-9555-10578916e666"' | jq '.node_name = "ubuntu(1)-alpha-myprofile(s)-skipped"' | send_chef_data_raw
generate_chef_run_failure_example | jq '.entity_uuid = "34cbbb55-c502-4971-2222-999999999999"' | jq '.node_name = "osx(1)-omega-pro2(w)-waived"' | send_chef_data_raw
generate_chef_run_failure_example | jq '.entity_uuid = "34cbbb4c-c502-4971-1111-888888888888"' | jq '.node_name = "osx(2)-omega-pro1(f)-pro2(w)-failed"' | send_chef_data_raw
pushd components/compliance-service/test_data/audit_reports &> /dev/null
./send_to_data_collector.sh https://a2-dev.test "$(get_admin_token)"
popd &> /dev/null
}

document "load_scan_jobs" <<DOC
Expand Down
93 changes: 51 additions & 42 deletions api/interservice/compliance/ingest/events/compliance/compliance.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/interservice/compliance/ingest/events/compliance/compliance.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ message Report {
repeated chef.automate.domain.compliance.common.Kv tags = 39;
string automate_manager_id = 40;
float run_time_limit = 41;
string automate_manager_type = 42;
}
3 changes: 3 additions & 0 deletions api/interservice/compliance/ingest/ingest/compliance.swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading