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

Jump to bottom

[ML] Re-enabling file upload telemetry #60418

Merged
merged 6 commits into from
Mar 18, 2020
Merged

[ML] Re-enabling file upload telemetry #60418

merged 6 commits into from
Mar 18, 2020

Conversation

jgowdyelastic
Copy link
Member

@jgowdyelastic jgowdyelastic commented Mar 17, 2020 •
edited
Loading

Fixes file datavisualizer upload telemetry which was broken by #60100

@jgowdyelastic jgowdyelastic requested a review from a team as a code owner March 17, 2020 17:19
@jgowdyelastic jgowdyelastic self-assigned this Mar 17, 2020
@jgowdyelastic jgowdyelastic added :ml Feature:File and Index Data Viz ML file and index data visualizer non-issue Indicates to automation that a pull request should not appear in the release notes release_note:skip Skip the PR/issue when compiling release notes review v7.7.0 v8.0.0 labels Mar 17, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/ml-ui (:ml)

alvarezmelissa87
alvarezmelissa87 approved these changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@alvarezmelissa87 alvarezmelissa87 left a comment

Choose a reason for hiding this comment

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

Code LGTM ⚡️ - just added a couple of comments about removing commented code.

@alvarezmelissa87
Copy link
Contributor

Latest edits LGTM ⚡️

peteharverson
peteharverson approved these changes Mar 17, 2020
View reviewed changes
Copy link
Contributor

@peteharverson peteharverson left a comment

Choose a reason for hiding this comment

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

LGTM

@jgowdyelastic
Copy link
Member Author

@elasticmachine merge upstream

@elasticmachine
Copy link
Contributor

merge conflict between base and head

@jgowdyelastic jgowdyelastic force-pushed the re-enabling-ml-file-upload-telemetry branch from 40e2386 to 83405d5 Compare March 17, 2020 22:00
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jgowdyelastic jgowdyelastic merged commit fd16c46 into elastic:master Mar 18, 2020
@jgowdyelastic jgowdyelastic deleted the re-enabling-ml-file-upload-telemetry branch March 18, 2020 08:33
@jgowdyelastic jgowdyelastic mentioned this pull request Mar 18, 2020
Merged
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 18, 2020
@gmmorris
Merge branch 'master' into alerting/view-in-app
ff45d00 
* master:
  [ML] Re-enabling file upload telemetry (elastic#60418)
  [NP] Use local helper shortenDottedString for discover (elastic#60271)
  [Console] Fix for `_settings` and x-pack autocomplete (elastic#60246)
  Task/host enhancements (elastic#59671)
  [Search service] Asynchronous ES search strategy (elastic#53538)
  Index Action - Moved index params fields to connector config (elastic#60349)
  Edits UI text for ML nodes and job button (elastic#60184)
  Publish getIsNavDrawerLocked$ method on core chrome service. (elastic#60191)
  Disabled edit alert button on management ui for non registered UI alert types (elastic#60439)
  Revert "[Console] Fix bool filter autocompletions and refactor (elastic#60361)"
  [Console] Fix bool filter autocompletions and refactor (elastic#60361)
  Update ingest management team handle (elastic#60457)
  [IM] Use EuiCodeBlock to render index mapping (elastic#60420)
  Add additional safeguards for data source wizard step 2 (elastic#60426)
  [kbn/pm] don't fail when plugins are outside repo (elastic#60164)
  upgrade react-use (elastic#60427)
  Remove link to old settings (elastic#60326)
  Update app arch CODEOWNERS items. (elastic#60396)
  [ML] Fixing custom urls to dashboards (elastic#60355)
  Update the ems-client dependency to 7.7.0 (elastic#59936)
jgowdyelastic added a commit to jgowdyelastic/kibana that referenced this pull request Mar 18, 2020
@jgowdyelastic
[ML] Re-enabling file upload telemetry (elastic#60418)
4ef3f17 
* [ML] Re-enabling file upload telemetry

* small refactor

* removing exported function

* removing commented out code

* removing commented out include

* cleaning up types
jgowdyelastic added a commit that referenced this pull request Mar 18, 2020
@jgowdyelastic
[ML] Re-enabling file upload telemetry (#60418) (#60479)
98fdd3d 
* [ML] Re-enabling file upload telemetry

* small refactor

* removing exported function

* removing commented out code

* removing commented out include

* cleaning up types
gmmorris added a commit to gmmorris/kibana that referenced this pull request Mar 19, 2020
@gmmorris
rge branch 'alerting/tls-warning' of github.com:gmmorris/kibana into …
38c5e1e 
…alerting/tls-warning

* 'alerting/tls-warning' of github.com:gmmorris/kibana: (33 commits)
  [ML] Disable functional transform tests
  Fixes to service map single node banner (elastic#60072)
  [Uptime] replace fetch with kibana http (elastic#59881)
  Upgrade @types/node to match Node.js runtime (elastic#60368)
  [License Management] NP migration (elastic#60250)
  Fix create alert button from not showing in alerts list (elastic#60444)
  [SIEM][Case] Update connector through flyout (elastic#60307)
  add data-test-subj where possible on SO management table (elastic#60226)
  Enforce `required` presence for value/key validation of `recordOf` and `mapOf`. (elastic#60406)
  [ML] Re-enabling file upload telemetry (elastic#60418)
  [NP] Use local helper shortenDottedString for discover (elastic#60271)
  [Console] Fix for `_settings` and x-pack autocomplete (elastic#60246)
  Task/host enhancements (elastic#59671)
  [Search service] Asynchronous ES search strategy (elastic#53538)
  Index Action - Moved index params fields to connector config (elastic#60349)
  Edits UI text for ML nodes and job button (elastic#60184)
  Publish getIsNavDrawerLocked$ method on core chrome service. (elastic#60191)
  Disabled edit alert button on management ui for non registered UI alert types (elastic#60439)
  Revert "[Console] Fix bool filter autocompletions and refactor (elastic#60361)"
  [Console] Fix bool filter autocompletions and refactor (elastic#60361)
  ...
@darnautov darnautov mentioned this pull request May 16, 2023
Merged
darnautov added a commit that referenced this pull request May 17, 2023
@darnautov
[ML] Fix the file upload telemetry (#157888)
57af98f 
## Summary

Fixes the usage collector for the file upload plugin. According to the
git history it hasn't been working since
#60418.

The saved objects repository required for retrieving telemetry data
wasn't provided, causing telemetry to fall back to
`index_creation_count: 0` after each check.


### How to test 

Execute the following request in the Dev Console.

```
POST kbn:/api/telemetry/v2/clusters/_stats
{ "unencrypted": true }
```


[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)
shouldn't be `null`.
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 17, 2023
@darnautov
[ML] Fix the file upload telemetry (elastic#157888)
59ec2f3 
## Summary

Fixes the usage collector for the file upload plugin. According to the
git history it hasn't been working since
elastic#60418.

The saved objects repository required for retrieving telemetry data
wasn't provided, causing telemetry to fall back to
`index_creation_count: 0` after each check.

### How to test

Execute the following request in the Dev Console.

```
POST kbn:/api/telemetry/v2/clusters/_stats
{ "unencrypted": true }
```

[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)
shouldn't be `null`.

(cherry picked from commit 57af98f)
kibanamachine added a commit that referenced this pull request May 17, 2023
@kibanamachine @darnautov
[8.8] [ML] Fix the file upload telemetry (#157888) (#157969)
4628c55 
# Backport

This will backport the following commits from `main` to `8.8`:
- [[ML] Fix the file upload telemetry
(#157888)](#157888)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Dima
Arnautov","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-05-17T09:36:58Z","message":"[ML]
Fix the file upload telemetry (#157888)\n\n## Summary\r\n\r\nFixes the
usage collector for the file upload plugin. According to the\r\ngit
history it hasn't been working
since\r\nhttps://github.com//pull/60418.\r\n\r\nThe saved
objects repository required for retrieving telemetry data\r\nwasn't
provided, causing telemetry to fall back to\r\n`index_creation_count: 0`
after each check.\r\n\r\n\r\n### How to test \r\n\r\nExecute the
following request in the Dev Console.\r\n\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{ \"unencrypted\": true
}\r\n```\r\n\r\n\r\n[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)\r\nshouldn't
be
`null`.","sha":"57af98f38a535432f7f085abaa3c9e7e4f67a53a","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Feature:File
Upload","telemetry","v8.9.0","v8.8.1"],"number":157888,"url":"https://github.com/elastic/kibana/pull/157888","mergeCommit":{"message":"[ML]
Fix the file upload telemetry (#157888)\n\n## Summary\r\n\r\nFixes the
usage collector for the file upload plugin. According to the\r\ngit
history it hasn't been working
since\r\nhttps://github.com//pull/60418.\r\n\r\nThe saved
objects repository required for retrieving telemetry data\r\nwasn't
provided, causing telemetry to fall back to\r\n`index_creation_count: 0`
after each check.\r\n\r\n\r\n### How to test \r\n\r\nExecute the
following request in the Dev Console.\r\n\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{ \"unencrypted\": true
}\r\n```\r\n\r\n\r\n[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)\r\nshouldn't
be
`null`.","sha":"57af98f38a535432f7f085abaa3c9e7e4f67a53a"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/157888","number":157888,"mergeCommit":{"message":"[ML]
Fix the file upload telemetry (#157888)\n\n## Summary\r\n\r\nFixes the
usage collector for the file upload plugin. According to the\r\ngit
history it hasn't been working
since\r\nhttps://github.com//pull/60418.\r\n\r\nThe saved
objects repository required for retrieving telemetry data\r\nwasn't
provided, causing telemetry to fall back to\r\n`index_creation_count: 0`
after each check.\r\n\r\n\r\n### How to test \r\n\r\nExecute the
following request in the Dev Console.\r\n\r\n```\r\nPOST
kbn:/api/telemetry/v2/clusters/_stats\r\n{ \"unencrypted\": true
}\r\n```\r\n\r\n\r\n[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)\r\nshouldn't
be
`null`.","sha":"57af98f38a535432f7f085abaa3c9e7e4f67a53a"}},{"branch":"8.8","label":"v8.8.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Dima Arnautov <[email protected]>
jasonrhodes pushed a commit that referenced this pull request May 17, 2023
@darnautov @jasonrhodes
[ML] Fix the file upload telemetry (#157888)
8688ab2 
## Summary

Fixes the usage collector for the file upload plugin. According to the
git history it hasn't been working since
#60418.

The saved objects repository required for retrieving telemetry data
wasn't provided, causing telemetry to fall back to
`index_creation_count: 0` after each check.


### How to test 

Execute the following request in the Dev Console.

```
POST kbn:/api/telemetry/v2/clusters/_stats
{ "unencrypted": true }
```


[`mlUsage`](https://github.com/elastic/kibana/blob/9047d69d574225212996ea9dbcd15dddc607d11e/x-pack/plugins/file_upload/server/telemetry/usage_collector.ts#L36)
shouldn't be `null`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alvarezmelissa87 alvarezmelissa87 alvarezmelissa87 approved these changes

@peteharverson peteharverson peteharverson approved these changes

@walterra walterra Awaiting requested review from walterra

@darnautov darnautov Awaiting requested review from darnautov

Assignees

@jgowdyelastic jgowdyelastic

Labels
Feature:File and Index Data Viz ML file and index data visualizer :ml non-issue Indicates to automation that a pull request should not appear in the release notes release_note:skip Skip the PR/issue when compiling release notes review v7.7.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jgowdyelastic @elasticmachine @alvarezmelissa87 @kibanamachine @peteharverson