Merge Master back to secops #25646
Merged
Merge Master back to secops #25646
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
translate Coordinate Map
add translations for region_map plugin
* [Tools] Add TemplateLiteral parsing to i18n_check tool * Add comments
Translate security/users
add translations for table vis plugin
translate new_nav_bar
…ntext (elastic#24705) * Fixes rare cases where KibanaLink will be loaded outside of React context and requires no redux connect dependency * Fixes tests for updated Kibana link component * Removes obsolete snapshot
* [ui/timeBuckets] test calcAutoInterval module * [ui/timeBuckets] refactor calcAutoInterval* methods * [calcAutoInterval] return 0ms when duration is invalid * [calcAutoInterval] incorporate review feedback
Instead of immediately throwing an error if a watch Action is invalid (an email for example), there is now an `option` object that we can pass to the `fromUpstreamJson()` method and receive back any error that might exist in a Watch. The Watch has a new "watchErrors" property to display configuration error in the UI. fixes elastic#20305 fixes elastic#20970
* fixing issue with doc link paths
* dding ccr API endpoints to autocomplet
* fixing issue with documentation links
* fixing generated specs {indices} -> {index}
…#24495) * Use the cluster name from metadata if it exists * PR comments
…#21169) * Default scroll wheel zoom to false on vega maps. Update docs * Update scroll wheel to false in tests
* Revert "Reporting cookies (elastic#24177)" This reverts commit 9f4ec18. * Take 2 * Adding comment * Better escaping and encoding for use in eval * Checking for an empty string also * Fixing session test
…elastic#24783) * Fix time field not being recognized due to ordering of aggs * Clean up UI whitespace * Update snapshot
* [kbn-datemath][parseEsInterval] improve types slightly * [kbn-datemath][vis/leastCommonInterval] make types more precise * [ui/leastCommonInterval] fix bug in finding same types * add back valid test
In order to support esjs apiVersion 6.5 we need to upgrade to the newly released version of elasticsearch-js. Bumping makelogs allowed us to keep only one version of the elasticsearch module installed.
* Removes infra links and replaces context menu with single discover links for now * Changes discover links to use empty button style
* Fixes check for security plugin * Cleaned up security check logic. Fixed tests for create_handlers. Added TODOs * Updated comment * Added tests * Updated variable names
…stic#24797) I noticed the following message while watching the build output: ``` 00:33:19.131 │ info [kibana] > /var/lib/jenkins/workspace/elastic+kibana+pull-request+multijob-x-pack/install/kibana/bin/kibana --optimize.useBundleCache=true --env.name=development --logging.json=false --server.port=5620 --optimize.watchPort=5630 --optimize.watchPrebuild=true --status.allowAnonymous=true --elasticsearch.url=http://elastic:changeme@localhost:9220 --elasticsearch.username=elastic --elasticsearch.password=changeme --server.uuid=5b2de169-2785-441b-ae8c-186a1936b17d --xpack.xpack_main.telemetry.enabled=false --xpack.security.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf" --optimize.enabled=true --xpack.reporting.capture.browser.type=chromium --xpack.spaces.enabled=false 00:33:38.533 │ proc [kibana] log [23:20:25.923] [info][optimize] Optimizing and caching bundles for ml, stateSessionStorageRedirect, status_page, timelion, graph, monitoring, login, logout, dashboardViewer, apm, canvas, infra and kibana. This may take a few minutes 00:34:12.650 │ proc [kibana] [BABEL] Note: The code generator has deoptimised the styling of "/var/lib/jenkins/workspace/elastic+kibana+pull-request+multijob-x-pack/install/kibana/node_modules/x-pack/plugins/infra/node_modules/lodash/lodash.js" as it exceeds the max of "500KB". 00:36:11.346 │ proc [kibana] log [23:22:58.721] [info][optimize] Optimization of bundles for ml, stateSessionStorageRedirect, status_page, timelion, graph, monitoring, login, logout, dashboardViewer, apm, canvas, infra and kibana complete in 152.79 seconds ``` The "code generator has deoptimised" line specifically raised a red flag as babel shouldn't be running on node_modules. We have admittedly weak regular expressions in two places to enforce this. The first is in https://github.com/elastic/kibana/blob/49071132c3c14590dea877bccb7647bbec1e1459/src/setup_node_env/babel_register/register.js#L42, which I verified matched `node_modules` directories within the `node_modules/x-pack` directory, but the other is https://github.com/elastic/kibana/blob/49071132c3c14590dea877bccb7647bbec1e1459/src/optimize/base_optimizer.js#L152-L154 which does not. It only excludes files from babel in webpack if they are within a node_modules directory that is a direct child of `node_modules/xpack`, but with InfraOps and Canvas we now have node_module directories at `plugins/*/node_modules`. This should probably be fixed by preventing plugins from installing their own node_modules, but since that would involve upgrading/moving plugins between major versions of dependencies like lodash that's somewhat impractical from where I stand, so instead I've just updated the webpack module rule to exclude any `node_modules/xpack/**/node_modules` directory.
This commit does three things: 0. This fixes the instructions for interacting with the heartbeat service, which is called `heartbeat-elastic` not `heartbeat` 1. This removes some extraneous text that should be reserved for the subsequent section. 2. This makes the instructions for creating a monitor more explicit
…rval. (elastic#24742) In certain cases tickInterval mistakenly could end up being negative which made getTickValues() run into a call stack size exception. This PR fixes it by a) adding a check to getTickValues() that interval must not be 0 or smaller and b) changing the way the tickInterval is determined in the Anomaly Explorer Charts.
* Adds icon and tooltip for dropped spans * Adds callout and style in transaction flyout instead of timeline for dropped spans message * Review tweaks and linting fixes
* Add translations for timelion plugin * Fix bugs * Fix messages ids, resolve comments * Update translations * Refactor links messages * Fix values bug * Use template literals to avoid single quote escaping
* Translate Monitoring logstash * Fix a typo * Update unit tests
* handle EuiSearchBar query parse failures * I18n parse failure messages * review updates * more cleanup on settings search.test
…l indices (elastic#24339) * don't hide wizard if clusters exist * catch errors * add toast notifs if unable to load data
When generating a plugin with the plugin generator and scss is in use, we should add the generated `app.css` file to the .gitignore file.
* Add a note about index migrations to the kibana setup docs * Tewak the migrations asciidocs for clarity * docs: refine saved object migration details Breaking down the migration process into sections helps people find and link to relevant information more easily. The focus is on ongoing maintenance of Kibana, whereas the initial new experience in 6.5.0 is treated as a note of clarification. Error handling should be expanded in the future to include details about specific known error cases.
* Translate monitoring -> summary_status, table, main.html in directives * Fix issues * Fix tests * Add disable eslint for unused var intl
* Create common routines for PDF and PNG report processing * REmove Blacklisted headers not needed * Changes for issues with PDF and PNG testing As per Joel Griffith suggestion I added removal of toast notifications after each click download report. And removed setting of image density to 300. * removed uneccesary image compare routine * Moved server from property on job to passed in parameter. * consolidated PDF and PNG testing Moved test code from PDF and PNG index.test.js into a common index.test.js that now tests the common functions. * Typescripted the common functions and broke out tests to individual test files * Create a common create mock server function that all new tests call * Removed unnecessary exception check and removed test include from index.ts
* Add href option in addition to onClick * Small modificationd and adding tests * Add missing import * Switch order of tests * Don't close panel menu again
We need to figure out just to do it for secops for now
|
Pinging @elastic/secops |
💚 Build Succeeded |
FrankHassanabad
approved these changes
Nov 14, 2018
|
When I looked at the style-lint PR, it looked like it was only configured for secops. I was able to make commits into secops without issues from other projects interfering. I approved this PR, but am curious. Was it preventing a merge from master because of bad css styles from the other projects? |
Exactly, some issue with their css styles from other projects, the pre-hook for commit was showing all the issue ( not a lot) but it will get more conflicts when we tried to go back to master. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I had to comment out style-lint for now because other projects are not using it. If not, it will block the merge back to master and we will have to fix style errors that not part of our project.
We need to figure out how to make the style-lint only to secops for now until other devs adopt it too.