Merge pull request #851 from utmstack/bugfix/v10.5.9/timezone-setting-not-applied-to-views

Bugfix/v10.5.9/timezone setting not applied to views

Author: c3s4rfred

CHANGELOG.md

@@ -1,3 +1,4 @@
-# UTMStack 10.5.9 Release Notes
+# UTMStack 10.5.10 Release Notes
 ## Bugfix
-- The fix ensures that the correct GMT offset is now included when showing timezones, providing more accurate information to the user.
+- Improved timezone handling for Data Source -> Last Input and Log Explorer views
+- Implemented a check to assign 'UNKNOWN' as the default key for buckets with empty keys to ensure data consistency.

backend/src/main/java/com/park/utmstack/util/chart_builder/elasticsearch_dsl/responses/impl/bar_chart/ResponseParserForBarChart.java

@@ -106,6 +106,9 @@ private void parseBuckets(Bucket bucket, Map<String, Aggregate> aggregations, Li
                 if (CollectionUtils.isEmpty(_buckets))
                     return;
                 for (BucketAggregation _bucket : _buckets) {
+                    if(_bucket.getKey().isEmpty()){
+                        _bucket.setKey("UNKNOWN");
+                    }
                     if (bucket.getType().equals(BucketType.AXIS))
                         retValue.addCategory(_bucket.getKey());
                     keys.add(_bucket.getKey());

backend/src/main/java/com/park/utmstack/util/chart_builder/elasticsearch_dsl/responses/impl/metric_chart/ResponseParserForMetricChart.java

@@ -81,6 +81,9 @@ private List<MetricChartResult> parseTermAggregation(Map<String, Aggregate> resu
 
             for (Metric metric : metrics) {
                 for (BucketAggregation _bucket : _buckets) {
+                    if(_bucket.getKey().isEmpty()){
+                        _bucket.setKey("UNKNOWN");
+                    }
                     switch (metric.getAggregation()) {
                         case AVERAGE:
                             AvgAggregate avg = _bucket.getSubAggregations().get(metric.getId()).avg();

backend/src/main/java/com/park/utmstack/util/chart_builder/elasticsearch_dsl/responses/impl/pie_chart/ResponseParserForPieChart.java

@@ -83,6 +83,9 @@ private List<PieChartResult> parseTermAggregation(Map<String, Aggregate> result,
             List<PieChartResult> _return = new ArrayList<>();
 
             for (BucketAggregation _bucket : _buckets) {
+                if(_bucket.getKey().isEmpty()){
+                    _bucket.setKey("UNKNOWN");
+                }
                 switch (metric.getAggregation()) {
                     case AVERAGE:
                         AvgAggregate avg = _bucket.getSubAggregations().get(metric.getId()).avg();

backend/src/main/java/com/park/utmstack/util/chart_builder/elasticsearch_dsl/responses/impl/table_chart/ResponseParserForTableChart.java

@@ -85,7 +85,7 @@ private void parseBuckets(Bucket bucket, Map<String, Aggregate> aggregations, Li
                 if (CollectionUtils.isEmpty(_buckets))
                     return;
                 for (BucketAggregation _bucket : _buckets) {
-                    rowCells.add(new TableChartResult.Cell<>(_bucket.getKey(), false));
+                    rowCells.add(new TableChartResult.Cell<>(!_bucket.getKey().isEmpty() ? _bucket.getKey() : "UNKNOWN", false));
                     parseBuckets(bucket.getSubBucket(), _bucket.getSubAggregations(), metrics, _bucket);
                 }
             } else {

frontend/src/app/assets-discover/assets-discover.module.ts

@@ -4,6 +4,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
 import {NgSelectModule} from '@ng-select/ng-select';
 import {ResizableModule} from 'angular-resizable-element';
+import {InlineSVGModule} from 'ng-inline-svg';
 import {NgxEchartsModule} from 'ngx-echarts';
 import {InfiniteScrollModule} from 'ngx-infinite-scroll';
 import {IncidentResponseSharedModule} from '../incident-response/shared/incident-response-shared.module';
@@ -15,12 +16,13 @@ import {AssetGroupDetailComponent} from './asset-groups/shared/components/asset-
 import {AssetGroupMetricsComponent} from './asset-groups/shared/components/asset-group-metrics/asset-group-metrics.component';
 import {AssetsDiscoverRoutingModule} from './assets-discover-routing.module';
 import {AssetsViewComponent} from './assets-view/assets-view.component';
+import {CollectorsViewComponent} from './collectors-view/collectors-view.component';
 import {AssetByGroupComponent} from './shared/components/asset-by-group/asset-by-group.component';
 import {AssetCreateComponent} from './shared/components/asset-create/asset-create.component';
 import {AssetDetailComponent} from './shared/components/asset-detail/asset-detail.component';
 import {AssetEditAliasComponent} from './shared/components/asset-edit-alias/asset-edit-alias.component';
 import {AssetFieldRenderComponent} from './shared/components/asset-field-render/asset-field-render.component';
-import {AssetGroupAddComponent} from './shared/components/asset-group-add/asset-group-add.component';
+import {AssetsGroupAddModule} from './shared/components/asset-group-add/assets-group-add.module';
 import {AssetIpComponent} from './shared/components/asset-ip/asset-ip.component';
 import {AssetIsAliveComponent} from './shared/components/asset-is-alive/asset-is-alive.component';
 import {AssetMetricsComponent} from './shared/components/asset-metrics/asset-metrics.component';
@@ -33,21 +35,17 @@ import {AssetSoftwareSelectComponent} from './shared/components/asset-software-s
 import {AssetSoftwaresComponent} from './shared/components/asset-softwares/asset-softwares.component';
 import {AssetStatusComponent} from './shared/components/asset-status/asset-status.component';
 import {AssetViewHelpComponent} from './shared/components/asset-view-help/asset-view-help.component';
-import {AssetsApplyNoteComponent} from './shared/components/assets-apply-note/assets-apply-note.component';
-import {AssetsApplyTypeComponent} from './shared/components/assets-apply-type/assets-apply-type.component';
+import {AssetsApplyNoteModule} from './shared/components/assets-apply-note/assets-apply-note.module';
+import {AssetsApplyTypeModule} from './shared/components/assets-apply-type/assets-apply-type.module';
 import {AssetsPortsComponent} from './shared/components/assets-ports/assets-ports.component';
+import {CollectorStatusComponent} from './shared/components/collector-status/collector-status.component';
 import {AssetActiveFilterComponent} from './shared/components/filters/asset-active-filter/asset-active-filter.component';
 import {AssetFilterApplyingComponent} from './shared/components/filters/asset-filter-applying/asset-filter-applying.component';
 import {AssetFilterIsAliveComponent} from './shared/components/filters/asset-filter-is-alive/asset-filter-is-alive.component';
 import {AssetGenericFilterComponent} from './shared/components/filters/asset-generic-filter/asset-generic-filter.component';
 import {AssetsFilterComponent} from './shared/components/filters/assets-filter/assets-filter.component';
 import {SourceDataTypeConfigComponent} from './source-data-type-config/source-data-type-config.component';
-import {AssetsApplyTypeModule} from './shared/components/assets-apply-type/assets-apply-type.module';
-import {AssetsApplyNoteModule} from './shared/components/assets-apply-note/assets-apply-note.module';
-import {AssetsGroupAddModule} from './shared/components/asset-group-add/assets-group-add.module';
-import {InlineSVGModule} from 'ng-inline-svg';
-import {CollectorsViewComponent} from "./collectors-view/collectors-view.component";
-import {CollectorStatusComponent} from "./shared/components/collector-status/collector-status.component";
+import {UtmDatePipe} from "../shared/pipes/date.pipe";
 
 @NgModule({
   declarations: [
@@ -111,6 +109,9 @@ import {CollectorStatusComponent} from "./shared/components/collector-status/col
         AssetsGroupAddModule,
         InlineSVGModule
     ],
+  providers: [
+    UtmDatePipe
+  ],
   schemas: [NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA]
 })
 export class AssetsDiscoverModule {

frontend/src/app/assets-discover/assets-view/assets-view.component.ts

@@ -13,6 +13,7 @@ import {SortEvent} from '../../shared/directives/sortable/type/sort-event';
 import {ChartValueSeparator} from '../../shared/enums/chart-value-separator';
 import {ElasticOperatorsEnum} from '../../shared/enums/elastic-operators.enum';
 import {IncidentOriginTypeEnum} from '../../shared/enums/incident-response/incident-origin-type.enum';
+import {UtmDatePipe} from '../../shared/pipes/date.pipe';
 import {IncidentCommandType} from '../../shared/types/incident/incident-command.type';
 import {UtmFieldType} from '../../shared/types/table/utm-field.type';
 import {TimeFilterType} from '../../shared/types/time-filter.type';
@@ -82,7 +83,8 @@ export class AssetsViewComponent implements OnInit, OnDestroy {
               private router: Router,
               private spinner: NgxSpinnerService,
               private accountService: AccountService,
-              private assetFiltersBehavior: AssetFiltersBehavior) {
+              private assetFiltersBehavior: AssetFiltersBehavior,
+              private datePipe: UtmDatePipe) {
   }
 
   // Init get asset on time filter component trigger
@@ -309,7 +311,7 @@ export class AssetsViewComponent implements OnInit, OnDestroy {
   getLastInput(asset: NetScanType) {
     if (asset.dataInputList.length > 0) {
       const lastInput = asset.dataInputList.sort((a, b) => a.timestamp > b.timestamp ? 1 : -1)[0].timestamp;
-      return this.formatTimestampToDate(lastInput);
+      return this.datePipe.transform(this.formatTimestampToDate(lastInput));
     } else {
       return 'Unknown';
     }

frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html

@@ -77,8 +77,7 @@
               <span class="font-weight-light"><i class="icon-list2"></i>&nbsp;{{totalItems}} records</span>
             </div>
             <div class="d-flex span-small-icon">
-              <span class="font-weight-light"><i class="icon-earth"></i>&nbsp;Display Time ({{dateFormat.timezone}}
-                )</span>
+              <span *ngIf="dateFormat$ | async as dateFormat" class="font-weight-light"><i class="icon-earth"></i>&nbsp;Display Time ({{ dateFormat.timezone }})</span>
             </div>
           </div>
 

frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.ts

@@ -4,6 +4,7 @@ import {ActivatedRoute} from '@angular/router';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {ResizeEvent} from 'angular-resizable-element';
 import * as moment from 'moment';
+import {Observable} from 'rxjs';
 import {UtmToastService} from '../../../shared/alert/utm-toast.service';
 import {ElasticFilterDefaultTime} from '../../../shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component';
 import {UtmFilterBehavior} from '../../../shared/components/utm/filters/utm-elastic-filter/shared/behavior/utm-filter.behavior';
@@ -16,7 +17,6 @@ import {ElasticOperatorsEnum} from '../../../shared/enums/elastic-operators.enum
 import {DataNatureTypeEnum, NatureDataPrefixEnum} from '../../../shared/enums/nature-data.enum';
 import {ElasticDataExportService} from '../../../shared/services/elasticsearch/elastic-data-export.service';
 import {ElasticDataService} from '../../../shared/services/elasticsearch/elastic-data.service';
-import {ElasticSearchIndexService} from '../../../shared/services/elasticsearch/elasticsearch-index.service';
 import {TimezoneFormatService} from '../../../shared/services/utm-timezone.service';
 import {DatePipeDefaultOptions} from '../../../shared/types/date-pipe-default-options';
 import {ElasticSearchFieldInfoType} from '../../../shared/types/elasticsearch/elastic-search-field-info.type';
@@ -25,7 +25,6 @@ import {UtmIndexPattern} from '../../../shared/types/index-pattern/utm-index-pat
 import {UtmFieldType} from '../../../shared/types/table/utm-field.type';
 import {parseQueryParamsToFilter} from '../../../shared/util/query-params-to-filter.util';
 import {LogAnalyzerQueryCreateComponent} from '../../queries/log-analyzer-query-create/log-analyzer-query-create.component';
-import {DataSortBehavior} from '../../shared/behaviors/data-sort.behavior';
 import {IndexFieldController} from '../../shared/behaviors/index-field-controller.behavior';
 import {IndexPatternBehavior} from '../../shared/behaviors/index-pattern.behavior';
 import {LogFilterBehavior} from '../../shared/behaviors/log-filter.behavior';
@@ -67,19 +66,17 @@ export class LogAnalyzerViewComponent implements OnInit, OnDestroy {
   patterns: UtmIndexPattern[];
   paramLoaded = false;
   defaultTime: ElasticFilterDefaultTime = new ElasticFilterDefaultTime('now-24h', 'now');
-  dateFormat: DatePipeDefaultOptions;
+  dateFormat$: Observable<DatePipeDefaultOptions>;
 
   constructor(private indexPatternBehavior: IndexPatternBehavior,
               private logAnalyzerService: ElasticDataService,
-              private indexPatternFieldService: ElasticSearchIndexService,
               private indexFieldController: IndexFieldController,
               private modalService: NgbModal,
               private queryRunBehavior: QueryRunBehavior,
               private activatedRoute: ActivatedRoute,
               private utmToastService: UtmToastService,
               private utmFilterBehavior: UtmFilterBehavior,
               private elasticDataExportService: ElasticDataExportService,
-              private dataSortBehavior: DataSortBehavior,
               private timezoneFormatService: TimezoneFormatService,
               private logFilterBehavior: LogFilterBehavior) {
     this.detailWidth = (this.pageWidth - 310);
@@ -98,15 +95,6 @@ export class LogAnalyzerViewComponent implements OnInit, OnDestroy {
         }
       }
     });
-    this.timezoneFormatService.getDateFormatSubject().subscribe(format => {
-      this.dateFormat = format;
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.filters = [];
-    this.utmFilterBehavior.$filterChange.next(null);
-    this.utmFilterBehavior.$filterExistChange.next(null);
   }
 
   ngOnInit() {
@@ -117,6 +105,8 @@ export class LogAnalyzerViewComponent implements OnInit, OnDestroy {
     } else {
       this.initExplorer();
     }
+
+    this.dateFormat$ = this.timezoneFormatService.getDateFormatSubject();
   }
 
   initExplorer() {
@@ -338,4 +328,10 @@ export class LogAnalyzerViewComponent implements OnInit, OnDestroy {
       this.fieldWidth = $event.rectangle.width + 'px';
     }
   }
+
+  ngOnDestroy(): void {
+    this.filters = [];
+    this.utmFilterBehavior.$filterChange.next(null);
+    this.utmFilterBehavior.$filterExistChange.next(null);
+  }
 }

version.yml

@@ -1 +1 @@
-version: 10.5.9
+version: 10.5.10