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.

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

initial munki tables #217

Merged
merged 2 commits into from
Dec 1, 2017
Merged

initial munki tables #217

merged 2 commits into from
Dec 1, 2017

Conversation

groob
Copy link
Contributor

@groob groob commented Nov 30, 2017

I'm sure I'm missing some stuff, but this is great to have. 
osquery> select * from kolide_munki_report;
+------------+---------------------------+---------------------------+---------+--------------------------------------------------+----------+--------------+---------------+
| version    | start_time                | end_time                  | success | errors                                           | warnings | console_user | manifest_name |
+------------+---------------------------+---------------------------+---------+--------------------------------------------------+----------+--------------+---------------+
| 3.0.0.3333 | 2017-11-30 19:46:13 +0000 | 2017-11-30 19:46:15 +0000 | false   | No default Software Update CatalogURL for: 10.13 |          | victor       | site_default  |
+------------+---------------------------+---------------------------+---------+--------------------------------------------------+----------+--------------+---------------+
osquery> select * from kolide_munki_installs;
+-------------------+-----------+---------------------+---------------------------+
| installed_version | installed | name                | end_time                  |
+-------------------+-----------+---------------------+---------------------------+
| 2.0.0             | true      | yo                  | 2017-11-30 19:46:15 +0000 |
| 5.1.0             | true      | kolide-corp-osquery | 2017-11-30 19:46:15 +0000 |
| 0.2.1-15-g50e9947 | true      | launcher            | 2017-11-30 19:46:15 +0000 |
+-------------------+-----------+---------------------+---------------------------+

@groob groob requested a review from marpaia December 1, 2017 00:55
Copy link
Contributor

@zwass zwass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

}

func (m *MunkiInfo) generateMunkiInstalls(ctx context.Context, queryContext table.QueryContext) ([]map[string]string, error) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove newline

return nil, err
}

var errors string
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplify to

errors := strings.Join(m.report.Errors, ";")
warnings := strings.Join(m.report.Warnings, ";")

@groob groob merged commit bf16180 into kolide:master Dec 1, 2017
@groob groob deleted the munki_table branch December 1, 2017 03:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants