Skip to content

Commit

Permalink
Log search => TypeScript
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Crowell committed May 28, 2018
1 parent f8651c5 commit 2fcf8e8
Show file tree
Hide file tree
Showing 16 changed files with 465 additions and 418 deletions.
57 changes: 22 additions & 35 deletions common/logcolumns.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,6 @@ export function quoteTerm(term: string): string {
return /[:\s]/.test(term) ? ('"' + term + '"') : term;
}

/**
* Converts a string/Date scalar/array to a single date.
* @param v Value to convert to a date.
*/
function asDate(v: Date | Date[] | string | string[] | undefined): Date | undefined {
const scalar = util.asScalar<string | Date>(v);

if(scalar === undefined)
return undefined;
else if(typeof scalar === 'string')
return new Date(scalar);
else
return scalar;
}

type ColumnValue<V> = V | V[] | undefined;

interface Formatter<T, V> {
Expand Down Expand Up @@ -375,20 +360,20 @@ class VistaTimeClassColumn extends DefaultColumn<templates.VistaLogEntry, Date>
}
}

class WsaTimeDecisionColumn extends DefaultColumn<templates.WsaLogEntry, Date> {
class WsaTimeDecisionColumn extends DefaultColumn<templates.WsaLogEntry, Date | string> {
constructor() {
super('time', 'log.eventTime', 'Time', CAT_STAND, entry => entry._source.log.eventTime, { defaultSortOrder: 'desc' });
}

writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.WsaLogEntry>, callbacks: AlterTermCallbacks) {
writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.WsaLogEntry>, callbacks: AlterTermCallbacks) {
const labelClasses: { [x: string]: string } = {
SUCCESS: 'label-success',
WARNING: 'label-warning',
FAILURE: 'label-danger',
DEFAULT: 'label-default',
};

const time = asDate(value);
const time = util.asDate(util.asScalar(value));

td.style('white-space', 'pre');
td.append('a')
Expand All @@ -414,7 +399,7 @@ class WsaTimeDecisionColumn extends DefaultColumn<templates.WsaLogEntry, Date> {
.text(entry._source.wsa.aclDecision);
}

rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, time: Date, entry: LogDocument<templates.WsaLogEntry>, callbacks: AlterTermCallbacks) {
rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, time: Date | string, entry: LogDocument<templates.WsaLogEntry>, callbacks: AlterTermCallbacks) {
td.selectAll('*').remove();
this.writeCell(td, time, entry, callbacks);
}
Expand Down Expand Up @@ -872,15 +857,15 @@ wsaColumns.forEach((col, i) => {
col.index = i;
});

const wsaColumnsByName = util.toMap(wsaColumns, d => d.name);
export const wsaColumnsByName = util.toMap(wsaColumns, d => d.name);

class CylanceTimeTypeColumn extends DefaultColumn<templates.CylanceLogEntry, Date> {
class CylanceTimeTypeColumn extends DefaultColumn<templates.CylanceLogEntry, Date | string> {
constructor() {
super('time', 'log.eventTime', 'Time', CAT_STAND, a => a._source.log.eventTime ? new Date(a._source.log.eventTime) : undefined, { defaultSortOrder: 'desc' });
}

writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
const time = asDate(value);
writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
const time = util.asDate(util.asScalar(value));

const ago = d3filters.ago(time, {precise: true}), full = d3filters.ago(time, {precise: true, alwaysFull: true});

Expand All @@ -896,7 +881,7 @@ class CylanceTimeTypeColumn extends DefaultColumn<templates.CylanceLogEntry, Dat
.text(ago);
};

rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
td.selectAll('*').remove();
this.writeCell(td, value, entry, callbacks);
};
Expand Down Expand Up @@ -1074,13 +1059,13 @@ cylanceColumns.forEach((col, i) => {

export const cylanceColumnsByName = util.toMap(cylanceColumns, d => d.name);

class SqlTimeTypeColumn extends DefaultColumn<templates.SqlLogEntry, Date> {
class SqlTimeTypeColumn extends DefaultColumn<templates.SqlLogEntry, Date | string> {
constructor() {
super('time', 'log.eventTime', 'Time', CAT_STAND, entry => entry._source.log.eventTime, { defaultSortOrder: 'desc' });
}

writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.SqlLogEntry>, callbacks: AlterTermCallbacks) {
const time = asDate(value);
writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.SqlLogEntry>, callbacks: AlterTermCallbacks) {
const time = util.asDate(util.asScalar(value));

td.style('white-space', 'pre');
td.append('a')
Expand All @@ -1106,7 +1091,7 @@ class SqlTimeTypeColumn extends DefaultColumn<templates.SqlLogEntry, Date> {
.text(entry._source.sql.EventType);
}

rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.SqlLogEntry>, callbacks: AlterTermCallbacks) {
rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.SqlLogEntry>, callbacks: AlterTermCallbacks) {
td.selectAll('*').remove();
this.writeCell(td, value, entry, callbacks);
}
Expand Down Expand Up @@ -1370,8 +1355,8 @@ const sqlColumns = [
searchable: false,
}),

new DefaultColumn<templates.SqlLogEntry, Date>('StartTime', 'sql.StartTime', 'StartTime', CAT_STATS, entry => entry._source.sql.StartTime, {baseUrl: 'logs/sql', searchable: false}),
new DefaultColumn<templates.SqlLogEntry, Date>('EndTime', 'sql.EndTime', 'EndTime', CAT_STATS, entry => entry._source.sql.EndTime, {baseUrl: 'logs/sql', searchable: false}),
new DefaultColumn<templates.SqlLogEntry, Date | string>('StartTime', 'sql.StartTime', 'StartTime', CAT_STATS, entry => entry._source.sql.StartTime, {baseUrl: 'logs/sql', searchable: false}),
new DefaultColumn<templates.SqlLogEntry, Date | string>('EndTime', 'sql.EndTime', 'EndTime', CAT_STATS, entry => entry._source.sql.EndTime, {baseUrl: 'logs/sql', searchable: false}),
];

sqlColumns.forEach((col, i) => {
Expand All @@ -1380,17 +1365,19 @@ sqlColumns.forEach((col, i) => {

export const sqlColumnsByName = util.toMap(sqlColumns, d => d.name);

class SyslogTimeColumn extends DefaultColumn<templates.BaseLogEntry, Date> {
class SyslogTimeColumn extends DefaultColumn<templates.BaseLogEntry, Date | string> {
constructor() {
super('time', 'log.eventTime', 'Time', CAT_STAND, entry => entry._source.log.eventTime, { defaultSortOrder: 'desc' });
}

writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
writeCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
const time = util.asDate(util.asScalar(value));

td.style('white-space', 'pre');
td.append('a')
//.attr('href', 'logs/syslog/entry/' + encodeURIComponent(entry._index.substring(7)) + '/' + encodeURIComponent(entry._id))
.attr('title', d3filters.date(entry._source.log.eventTime, '%A %Y-%m-%d %H:%M:%S.%L%Z'))
.text(d3filters.ago(entry._source.log.eventTime));
.attr('title', d3filters.date(time, '%A %Y-%m-%d %H:%M:%S.%L%Z'))
.text(d3filters.ago(time));
//td.append('br');

//const decisionCategory = entry._source.wsa.aclDecision.split('_')[0];
Expand All @@ -1410,7 +1397,7 @@ class SyslogTimeColumn extends DefaultColumn<templates.BaseLogEntry, Date> {
.text(entry._source.sql.EventType);*/
}

rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date>, HTMLElement, any>, value: ColumnValue<Date>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
rewriteCell(td: d3.Selection<HTMLTableCellElement, ColumnValue<Date | string>, HTMLElement, any>, value: ColumnValue<Date | string>, entry: LogDocument<templates.BaseLogEntry>, callbacks: AlterTermCallbacks) {
td.selectAll('*').remove();
this.writeCell(td, value, entry, callbacks);
}
Expand Down
130 changes: 78 additions & 52 deletions common/logtemplates.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export interface LogCommon {
recordFinder: string;
receivingPort: number;
reportingIp: string;
receivedTime: Date;
eventTime?: Date;
receivedTime: Date | string;
eventTime?: Date | string;
tag: string[];
message?: string;
ipProtocol?: number;
Expand Down Expand Up @@ -294,81 +294,107 @@ export interface CylanceLogEntry extends BaseLogEntry {

export interface SqlLogEntry extends BaseLogEntry {
sql: {
TSQLCommand: string;
TextData: string;
TSQLCommand?: string;
TextData?: string;
EventType: string;
DatabaseName: string;
DBUserName: string;
NTUserName: string;
NTDomainName: string;
HostName: string;
ApplicationName: string;
LoginName: string;
ServerName: string;
DatabaseName?: string;
DBUserName?: string;
NTUserName?: string;
NTDomainName?: string;
HostName?: string;
ApplicationName?: string;
LoginName?: string;
ServerName?: string;

/** User who originated the session. */
SessionLoginName: string;
SchemaName: string;
ObjectName: string;
ObjectType: string;
OwnerName: string;
AlterTableActionList: string;
TargetObjectType: string;
TargetUserName: string;
NestLevel: number;
Parameters: string;
DefaultSchema: string;
PropertyName: string;
PropertyValue: string;
TargetObjectName: string;
TargetLoginName: string;
SID: string;
LoginSid: string;
TargetLoginSid: string;
SessionLoginName?: string;
SchemaName?: string;
ObjectName?: string;
ObjectType?: string;
OwnerName?: string;
AlterTableActionList?: string;
TargetObjectType?: string;
TargetUserName?: string;
NestLevel?: number;
Parameters?: string;
DefaultSchema?: string;
PropertyName?: string;
PropertyValue?: string;
TargetObjectName?: string;
TargetLoginName?: string;
SID?: string;
LoginSid?: string;
TargetLoginSid?: string;

/** True for a system process, false for a user process. */
IsSystem: boolean;
Success: boolean;
IsSystem?: boolean;
Success?: boolean;

DatabaseID: number;
RequestID: number;
GroupID: number;
Error: number;
Severity: number;
DatabaseID?: number;
RequestID?: number;
GroupID?: number;
Error?: number;
Severity?: number;

/** Session ID. */
SPID: number;
State: number;
ClientProcessID: number;
Duration: number;
EventClass: number;
EventSubClass: number;
Permissions: number;
SPID?: number;
State?: number;
ClientProcessID?: number;
Duration?: number;
EventClass?: number;
EventSubClass?: number;
Permissions?: number;

/** Token that describes the current transaction. */
XactSequence: number;
XactSequence?: number;

/** Sequence of the event in the request. */
EventSequence: number;
EventSequence?: number;

/** Number of page reads. */
Reads: number;
Reads?: number;

/** Number of page writes. */
Writes: number;
Writes?: number;

/** CPU time in milliseconds. */
CPU: number;
CPU?: number;

/** Means different things depending on the type.
*
* See, for example:
*
* * https://docs.microsoft.com/en-us/sql/relational-databases/event-classes/lock-acquired-event-class?view=sql-server-2017
*/
Type: number;
Type?: number;

StartTime: Date;
EndTime: Date;
StartTime?: Date | string;
EndTime?: Date | string;
}
}

export interface AppStatusLogEntry extends BaseLogEntry {
status: {
processId: number;
processVersion: string;
processStatus: string;
program: string;
processStartTime: Date | string;
processBuildTime: Date | string;
}
}

export interface BunyanLogEntry extends BaseLogEntry {
bunyan: {
pid: number;
module: string;
level: number;
interest: number;
msg: string;
err?: {
name: string;
message: string;
stack: string;
}
}
}
21 changes: 21 additions & 0 deletions common/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,27 @@ export function asScalar<T>(v: T | T[] | undefined | null): T | undefined {
return v;
}

/**
* Ensures a Date/string is converted to a date.
* @param v Value to convert to a date.
*/
export function asDate(v: Date | number | string | undefined): Date | undefined {
if(v === undefined)
return undefined;
else if(typeof v === 'string' || typeof v === 'number')
return new Date(v);
else
return v;
}

/**
* Combines several arrays into one.
* @param v Arrays to combine.
*/
export function combineArrays<T>(v: T[][]): T[] {
return ([] as T[]).concat(...v);
}

export function shrinkTitleId(value: string): string {
return value.toLowerCase().split(/[:/\\\-""?,&+ ]+/).filter(val => val !== '').join('-');
}
Expand Down
Loading

0 comments on commit 2fcf8e8

Please sign in to comment.