Skip to content

Commit

Permalink
Merge branch 'master' into task-manager/health
Browse files Browse the repository at this point in the history
* master:
  [Security Solution][Endpoint][Admin] Malware Protections Notify User Version (#81415)
  Revert "[Actions] Adding `hasAuth` to Webhook Configuration to avoid confusing UX (#81390)"
  [Maps] Use default format when proxying EMS-files (#79760)
  [Discover] Deangularize context.html (#81442)
  Use the displayName property in default editor (#73311)
  adds bug label to Bug report for Security Solution template (#81643)
  [ML] Transforms: Remove index field limitation for custom query. (#81467)
  [Actions] Adding `hasAuth` to Webhook Configuration to avoid confusing UX (#81390)
  [Task Manager] Mark task as failed if maxAttempts has been met. (#80681)
  [Lens] Fix URL query loss on redirect (#81475)
  Log reason for 404 in field existence check (#81315)
  • Loading branch information
gmmorris committed Oct 27, 2020
2 parents e59ebc0 + 8c07eb9 commit 5d8f750
Show file tree
Hide file tree
Showing 31 changed files with 452 additions and 1,037 deletions.
76 changes: 38 additions & 38 deletions .github/ISSUE_TEMPLATE/Bug_report_security_solution.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
---
name: Bug report for Security Solution
about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
title: '[Security Solution]'
labels: 'Team: SecuritySolution'
---

**Describe the bug:**

**Kibana/Elasticsearch Stack version:**

**Server OS version:**

**Browser and Browser OS versions:**

**Elastic Endpoint version:**

**Original install method (e.g. download page, yum, from source, etc.):**

**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**

**Steps to reproduce:**

1.
2.
3.

**Current behavior:**

**Expected behavior:**

**Screenshots (if relevant):**

**Errors in browser console (if relevant):**

**Provide logs and/or server output (if relevant):**

**Any additional context (logs, chat logs, magical formulas, etc.):**
---
name: Bug report for Security Solution
about: Help us identify bugs in Elastic Security, SIEM, and Endpoint so we can fix them!
title: '[Security Solution]'
labels: 'bug, Team: SecuritySolution'
---

**Describe the bug:**

**Kibana/Elasticsearch Stack version:**

**Server OS version:**

**Browser and Browser OS versions:**

**Elastic Endpoint version:**

**Original install method (e.g. download page, yum, from source, etc.):**

**Functional Area (e.g. Endpoint management, timelines, resolver, etc.):**

**Steps to reproduce:**

1.
2.
3.

**Current behavior:**

**Expected behavior:**

**Screenshots (if relevant):**

**Errors in browser console (if relevant):**

**Provide logs and/or server output (if relevant):**

**Any additional context (logs, chat logs, magical formulas, etc.):**
39 changes: 9 additions & 30 deletions src/plugins/discover/public/application/angular/context_app.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
>
</kbn-top-nav>


<!-- Error feedback -->
<context-error-message
status="contextApp.state.loadingStatus.anchor.status"
Expand All @@ -21,43 +20,23 @@
class="kuiViewContent kuiViewContentItem"
ng-if="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.FAILED"
>
<!-- Controls -->
<context-action-bar
default-step-size="contextApp.state.queryParameters.defaultStepSize"
doc-count="contextApp.state.queryParameters.predecessorCount"
doc-count-available="contextApp.state.rows.predecessors.length"
is-disabled="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.LOADED"
is-loading="![
contextApp.constants.LOADING_STATUS.LOADED,
contextApp.constants.LOADING_STATUS.FAILED,
].includes(contextApp.state.loadingStatus.predecessors.status)"
on-change-count="contextApp.actions.fetchGivenPredecessorRows"
type="'predecessors'"
></context-action-bar>

<!-- Table -->
<context-app-legacy
filter="contextApp.actions.addFilter"
hits="contextApp.state.rows.all"
index-pattern="contextApp.indexPattern"
sorting="contextApp.state.queryParameters.sort"
columns="contextApp.state.queryParameters.columns"
infinite-scroll="true"
minimum-visible-rows="contextApp.state.rows.all.length"
status="contextApp.state.loadingStatus.anchor.status"
></context-app-legacy>

<!-- Controls -->
<context-action-bar
default-step-size="contextApp.state.queryParameters.defaultStepSize"
doc-count="contextApp.state.queryParameters.successorCount"
doc-count-available="contextApp.state.rows.successors.length"
is-disabled="contextApp.state.loadingStatus.anchor.status !== contextApp.constants.LOADING_STATUS.LOADED"
is-loading="![
contextApp.constants.LOADING_STATUS.LOADED,
contextApp.constants.LOADING_STATUS.FAILED,
].includes(contextApp.state.loadingStatus.successors.status)"
on-change-count="contextApp.actions.fetchGivenSuccessorRows"
type="'successors'"
></context-action-bar>
predecessor-count="contextApp.state.queryParameters.predecessorCount"
predecessor-available="contextApp.state.rows.predecessors.length"
predecessor-status="contextApp.state.loadingStatus.predecessors.status"
on-change-predecessor-count="contextApp.actions.fetchGivenPredecessorRows"
successor-count="contextApp.state.queryParameters.successorCount"
successor-available="contextApp.state.rows.successors.length"
successor-status="contextApp.state.loadingStatus.successors.status"
on-change-successor-count="contextApp.actions.fetchGivenSuccessorRows"
></context-app-legacy>
</main>
Loading

0 comments on commit 5d8f750

Please sign in to comment.