Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Truncate appname in log viewer to prevent wrapping

pull/4025/head
Brandon Farmer 2018-07-25 16:56:53 -07:00
parent 0a33f65847
commit 37e3092b14
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/src/logs/utils/index.ts
View File

@ -17,7 +17,7 @@ import {HistogramData} from 'src/types/histogram'
import {executeQueryAsync} from 'src/logs/api' import {executeQueryAsync} from 'src/logs/api'
const BIN_COUNT = 30 const BIN_COUNT = 30
const LOOK_BACK_LIMIT = 2592000 const SECONDS_AWAY_LIMIT = 2592000
const histogramFields = [ const histogramFields = [
{ {
@ -176,7 +176,7 @@ export function buildGeneralLogQuery(
return `${select}${condition}${dimensions}${fillClause}` return `${select}${condition}${dimensions}${fillClause}`
} }
export async function findCount( export async function queryCount(
lower, lower,
upper, upper,
config, config,
@ -218,12 +218,12 @@ export async function findBackwardLower(
let currentLower = parsedUpper.subtract(secondsBack, 'seconds') let currentLower = parsedUpper.subtract(secondsBack, 'seconds')
while (true) { while (true) {
if (secondsBack > LOOK_BACK_LIMIT) { if (secondsBack > SECONDS_AWAY_LIMIT) {
// One day // One day
break break
} }
const count = await findCount( const count = await queryCount(
currentLower.toISOString(), currentLower.toISOString(),
upper, upper,
config, config,
@ -254,16 +254,15 @@ export async function findForwardUpper(
): Promise<string> { ): Promise<string> {
const parsedLower = moment(lower) const parsedLower = moment(lower)
let secondsBack = 30 let secondsForward = 30
let currentUpper = parsedLower.add(secondsBack, 'seconds') let currentUpper = parsedLower.add(secondsForward, 'seconds')
while (true) { while (true) {
if (secondsBack > LOOK_BACK_LIMIT) { if (secondsForward > SECONDS_AWAY_LIMIT) {
// One day
break break
} }
const count = await findCount( const count = await queryCount(
lower, lower,
currentUpper.toISOString(), currentUpper.toISOString(),
config, config,
@ -277,8 +276,8 @@ export async function findForwardUpper(
break break
} }
secondsBack *= secondsBack secondsForward *= secondsForward
currentUpper = parsedLower.add(secondsBack, 'seconds') currentUpper = parsedLower.add(secondsForward, 'seconds')
} }
return currentUpper.toISOString() return currentUpper.toISOString()

6
ui/src/logs/utils/table.ts
View File

@ -10,6 +10,7 @@ import {
export const ROW_HEIGHT = 18 export const ROW_HEIGHT = 18
const CHAR_WIDTH = 9 const CHAR_WIDTH = 9
const DEFAULT_COLUMN_WIDTH = 200
export const getValuesFromData = (data: TableData): string[][] => export const getValuesFromData = (data: TableData): string[][] =>
getDeep(data, 'values', []) getDeep(data, 'values', [])
@ -37,6 +38,9 @@ export const formatColumnValue = (
switch (column) { switch (column) {
case 'timestamp': case 'timestamp':
return moment(+value / 1000000).format('YYYY/MM/DD HH:mm:ss') return moment(+value / 1000000).format('YYYY/MM/DD HH:mm:ss')
case 'appname':
const length = Math.floor(DEFAULT_COLUMN_WIDTH / CHAR_WIDTH) - 2
return _.truncate(value || '', {length})
case 'message': case 'message':
value = (value || 'No Message Provided').replace('\\n', '') value = (value || 'No Message Provided').replace('\\n', '')
if (value.indexOf(' ') > charLimit - 5) { if (value.indexOf(' ') > charLimit - 5) {
@ -70,7 +74,7 @@ export const getColumnWidth = (column: string): number => {
host: 300, host: 300,
}, },
column, column,
200 DEFAULT_COLUMN_WIDTH
) )
} }