Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

METRON-1875: Expose configurable global settings in the Alerts UI #1266

Closed
wants to merge 3 commits into from

Conversation

merrimanr
Copy link
Contributor

Contributor Comments

This PR exposes a JSON file that can be used to configure the Alerts UI. Properties in this file are read on startup and available through an AppConfigService that can be injected. The use case in this PR is a configurable REST API path. This path was hardcoded throughout the Alerts UI code but can now be changed in the configuration file directly. A restart or rebuild is not necessary, the change is visible as soon as the Alerts UI is refreshed in the browser. I think this could be generally useful for other use cases in the future.

Changes Included

  • An AppConfigService was added that loads configuration settings by requesting the config file as a static asset.
  • The various services were updated to use the apiRoot configuration setting instead of a hardcoded url.
  • We currently load column names from local storage on startup. I don't believe this is used anymore so I switched the initialization call to AppConfigService and removed the unused code in ColumnNameService.
  • Updated the unit tests to inject a mock AppConfigService instance.

Testing

To test this feature, spin up full dev and verify that the UI continues to function normally. Edit the file at /usr/metron/0.6.1/web/alerts-ui/assets/app-config.json' and set the apiRootproperty to a different value. Refresh the Alerts UI and verify the api path reflects the change inapp-config.json. For example if I changed app-config.json` to be:

{
  "apiRoot": "/some/api/path"
}

I would expect to see the search request url (in the network tab of Chrome developer tools for example) to be http://node1:4201/some/api/path/search/search.

Pull Request Checklist

Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines for complete smoke testing guides.

In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:

For all changes:

  • Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.
  • Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
  • Has your PR been rebased against the latest commit within the target branch (typically master)?

For code changes:

  • Have you included steps to reproduce the behavior or problem that is being changed or addressed?

  • Have you included steps or a guide to how the change may be verified and tested manually?

  • Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:

    mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
    
  • Have you written or updated unit tests and or integration tests to verify your changes?

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?

  • Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via site-book/target/site/index.html:

    cd site-book
    mvn site
    

Note:

Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that travis-ci is set up for your personal repository such that your branches are built there before submitting a pull request.


constructor(private http: HttpClient) { }

loadAppConfig() {
Copy link
Contributor

Choose a reason for hiding this comment

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

When we convert to a promise, we lose the advantages that come with using Observables, including it being cancelable. This helps to prevent possible memory leaks in the browser. Instead of converting to a promise, I think it would be better to use rxjs' take operator. For example:

loadAppConfig() {
  return this.http.get('assets/app-config.json').pipe(
    take(1)
  ).subscribe(data => {
    this.appConfig = data;
  });
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The approach in this PR was inspired by https://juristr.com/blog/2018/01/ng-app-runtime-config/. It mentions promises are not supported in APP_INITIALIZER. I tried your suggestion and it did not work. I can add a comment explaining that.

Copy link
Contributor

Choose a reason for hiding this comment

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

The linked article explains it perfectly. Disregard my suggestion since we need to be using a promise here.

@@ -31,12 +31,20 @@ import { UpdateService } from '../../../service/update.service';
import { GlobalConfigService } from '../../../service/global-config.service';
import { MetaAlertService } from '../../../service/meta-alert.service';
import { DialogService } from 'app/service/dialog.service';
import {AppConfigService} from "../../../service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

If possible, could you use single quotes and add spacing inside the brackets? This formatting is specified by our tslint config, and editors like VS code will show an error if it's not fixed.

@@ -32,6 +32,14 @@ import { UpdateService } from '../../../service/update.service';
import { GlobalConfigService } from '../../../service/global-config.service';
import { MetaAlertService } from '../../../service/meta-alert.service';
import { DialogService } from 'app/service/dialog.service';
import {AppConfigService} from "../../../service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

import {PcapModule} from './pcap/pcap.module';
import {AppConfigService} from "./service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -28,6 +28,7 @@ import { PcapRequest } from '../model/pcap.request';
import { of, defer } from 'rxjs';
import { RestError } from '../../model/rest-error';
import { ConfirmationPopoverModule } from 'angular-confirmation-popover';
import {AppConfigService} from "../../service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -33,6 +33,7 @@ import { PcapStatusResponse } from '../model/pcap-status-response';
import { PcapRequest } from '../model/pcap.request';
import { fakePdml, fakePacket } from '../model/pdml.mock';
import { fakePcapStatusResponse, fakePcapRequest } from '../model/pcap.mock';
import {AppConfigService} from "../../service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -25,6 +25,7 @@ import { HttpUtil } from '../../utils/httpUtil';
import { PcapRequest } from '../model/pcap.request';
import { Pdml } from '../model/pdml';
import { PcapStatusResponse } from '../model/pcap-status-response';
import {AppConfigService} from "../../service/app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -22,14 +22,15 @@ import {Alert} from '../model/alert';
import { HttpClient } from '@angular/common/http';
import {HttpUtil} from '../utils/httpUtil';
import { RestError } from '../model/rest-error';
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -22,26 +22,28 @@ import {Router} from '@angular/router';
import { ReplaySubject } from 'rxjs';
import { GlobalConfigService } from './global-config.service';
import { DataSource } from './data-source';
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -21,14 +21,15 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import {HttpUtil} from '../utils/httpUtil';
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -26,14 +26,15 @@ import {Alert} from '../model/alert';
import { HttpClient } from '@angular/common/http';
import {MetaAlertCreateRequest} from '../model/meta-alert-create-request';
import {MetaAlertAddRemoveRequest} from '../model/meta-alert-add-remove-request';
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -30,6 +30,7 @@ import { RestError } from '../model/rest-error';
import {INDEXES} from '../utils/constants';
import {ColumnMetadata} from '../model/column-metadata';
import {QueryBuilder} from '../alerts/alerts-list/query-builder';
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

@@ -28,6 +28,7 @@ import {Utils} from '../utils/utils';
import {Patch} from '../model/patch';
import { GlobalConfigService } from './global-config.service';
import {CommentAddRemoveRequest} from "../model/comment-add-remove-request";
import {AppConfigService} from "./app-config.service";
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use single quotes and add spacing inside the brackets here?

map(HttpUtil.extractData),
catchError(HttpUtil.handleError)
);
}

public getRunningJob(): Observable<PcapStatusResponse[]> {
return this.http.get(`/api/v1/pcap?state=RUNNING`).pipe(
return this.http.get(this.appConfigService.getApiRoot() + `/pcap?state=RUNNING`).pipe(
Copy link
Contributor

Choose a reason for hiding this comment

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

I think since you're not using multi-line strings and string interpolation features here, it's better to use single quotes rather than a template literal.

@merrimanr
Copy link
Contributor Author

I addressed the style issues and added a comment about APP_INITIALIZER and promises. Let me know what you think.

@sardell
Copy link
Contributor

sardell commented Nov 16, 2018

After addressing my concerns listed, I think this looks great! It's nice to have this architecture in place to make a change like this at runtime vs. compile time. I can see us taking advantage of this in the future for other use cases.

+1 tested on full dev per the instructions provided.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants