Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Fixed test app such that log trasmission is sent to send_logs. Also c…
…leaned up install/restart scripts.
  • Loading branch information
mbeard committed Mar 18, 2016
1 parent 853123e commit 28d11355b9bda0bd5892ad0b0ead67cba97641f5
Showing 11 changed files with 561 additions and 154 deletions.
@@ -38,7 +38,7 @@ Vagrant.configure(2) do |config|
# boxes.
# - Expose the following ports to be used within this box to
# host data being sent between the web server and the ELK server.
elk.vm.network "private_network", ip: "172.16.1.100"
elk.vm.network "private_network", ip: "192.16.1.100"

# Provisioner: Runs the provisioning script that will provision
# the vagrant box for the first time, or forced.
@@ -71,7 +71,7 @@ Vagrant.configure(2) do |config|
# Setup a static IP to allow both vagrant boxes to know where
# to contact each other. This will allow communication between the
# web developer and the logging server.
dev.vm.network "private_network", ip: "172.16.1.10"
dev.vm.network "private_network", ip: "192.16.1.10"

# Specify the provisioning script that will be used in order to
# install the necessary files needed for this vagrant box
@@ -49,7 +49,7 @@ $(document).ready(function () {

var ale2 = new userale(
{
loggingUrl: 'http://192.168.1.100',
loggingUrl: 'http://192.16.1.100',
toolName: 'userale-test',
toolVersion: '3.0.0',
elementGroups: [
@@ -66,7 +66,7 @@
#
# Set the bind address to a specific IP (IPv4 or IPv6):
#
# network.host: 192.168.0.1
# network.host: "172.16.1.100"
#
# Set a custom port for HTTP:
#
@@ -106,4 +106,10 @@
#
# Require explicit names when deleting indices:
#
# action.destructive_requires_name: true
# action.destructive_requires_name: true
http.cors.enabled: true
http.cors.allow-origin: "*"
# networking
# network.bind_host: 0
# network.publish_host: 0.0.0.0
network.host: 0.0.0.0
@@ -18,7 +18,7 @@
# server.port: 5601

# The host to bind the server to.
# server.host: "0.0.0.0"
# server.host: "localhost"

# If you are running kibana behind a proxy, and want to mount it at a path,
# specify that path here. The basePath can't end in a slash.
@@ -24,6 +24,7 @@ input {
"/var/log/xdata/xdata-v3.log"
]
start_position => beginning
#sincedb_path => "/dev/null"
}
}

@@ -51,34 +52,34 @@ output {
action => "index"
index => "xdata_old"
document_type => "testing"
template_overwrite => true
template => "/vagrant/files/templates/testing_old.json"
template_name => "testing"
#template_overwrite => true
#template => "/vagrant/files/templates/testing_old.json"
#template_name => "testing-old"
}
} else if [major_ver] > 2 {
elasticsearch {
hosts => ["localhost"]
action => "index"
index => "xdata_v3"
document_type => "testing"
template_overwrite => true
template => "/vagrant/files/templates/testing_v3.json"
template_name => "testing"
#template_overwrite => true
#template => "/vagrant/files/templates/testing_v3.json"
#template_name => "testing"
}
} else {
elasticsearch {
hosts => ["localhost"]
action => "index"
index => "xdata_v2"
document_type => "testing"
template_overwrite => true
template => "/vagrant/files/templates/testing_v2.json"
template_name => "testing"
#template_overwrite => true
#template => "/vagrant/files/templates/testing_v2.json"
#template_name => "testing"
}
}

# Ship logs to Database

# Debug
stdout { codec => rubydebug }
}
@@ -1,101 +1,166 @@
{
"template" : "testing",
"order" : 1,
"settings" : {
"number_of_shards" : 1,
"number_of_replicas" : 0,
"index.refresh_interval" : "60s"
},
"mappings" : {
"testing" : {
"properties" : {
"@timestamp" : {
"type" : "date",
"format" : "dateOptionalTime"
},
"@version" : {
"type" : "string"
},
"apiVersion" : {
"type" : "string"
},
"client" : {
"type" : "string"
},
"component" : {
"properties" : {
"name" : {
"index" : "not_analyzed",
"type" : "string"
},
"version" : {
"type" : "string"
"template":"testing-old",
"order":1,
"settings":{
"number_of_shards":1,
"number_of_replicas":0,
"index.refresh_interval":"5s"
},
"testing":{
"properties":{
"@timestamp":{
"type":"date",
"format":"date_optional_time"
},
"@version":{
"type":"string"
},
"apiVersion":{
"type":"string"
},
"client":{
"type":"string"
},
"component":{
"properties":{
"name":{
"type":"string",
"index":"not_analyzed"
},
"version":{
"type":"string"
}
}
}
},
"host" : {
"type" : "string"
},
"impLanguage" : {
"type" : "string"
},
"major_ver" : {
"type" : "long"
},
"meta" : {
"type" : "long"
},
"minor_ver" : {
"type" : "long"
},
"oid" : {
"properties" : {
"$oid" : {
"type" : "string"
},
"host":{
"type":"string",
"index":"not_analyzed"
},
"impLanguage":{
"type":"string",
"index":"not_analyzed"
},
"major_ver":{
"type":"integer"
},
"meta":{
"properties":{
"expanded":{
"type":"boolean"
},
"UIOjectId":{
"type":"string"
},
"UIOjectIds":{
"type":"string",
"index":"not_analyzed"
},
"UIOjectType":{
"type":"string",
"index":"not_analyzed"
},
"UIContainerId":{
"type":"string",
"index":"not_analyzed"
},
"contextId":{
"type":"string"
},
"duration":{
"type":"string",
"index":"not_analyzed"
},
"endDate":{
"type":"string"
},
"entityCount":{
"type":"integer"
},
"fileId":{
"type":"string"
},
"fromDragDropEvent":{
"type":"boolean"
},
"numBuckets":{
"type":"integer"
},
"page":{
"type":"integer"
},
"requestedFromColumn":{
"type":"boolean"
},
"searchControlId":{
"type":"string"
},
"sessionID":{
"type":"string",
"index":"not_analyzed"
},
"showDetails":{
"type":"boolean"
},
"startDate":{
"type":"string"
},
"totalColumns":{
"type":"integer"
},
"xfld":{
"type":"string"
}
}
}
},
"parms" : {
"properties" : {
"activity" : {
"index" : "not_analyzed",
"type" : "string"
},
"desc" : {
"type" : "string"
},
"wf_state" : {
"type" : "string"
},
"wf_version" : {
"type" : "string"
},
"minor_ver":{
"type":"integer"
},
"oid":{
"properties":{
"$oid":{
"type":"string"
}
}
}
},
"patch_ver" : {
"type" : "long"
},
"path" : {
"type" : "string"
},
"sessionID" : {
"type" : "string"
},
"tags" : {
"type" : "string"
},
"timestamp" : {
"properties" : {
"$date" : {
"type" : "date",
"format" : "dateOptionalTime"
},
"parms":{
"properties":{
"activity":{
"type":"string",
"index":"not_analyzed"
},
"desc":{
"type":"string"
},
"wf_state":{
"type":"integer"
},
"wf_version":{
"type":"float"
}
}
}
},
"type" : {
"type" : "string"
}
},
"path":{
"type":"string"
},
"sessionID":{
"type":"string",
"index":"not_analyzed"
},
"tags":{
"type":"string"
},
"timestamp":{
"properties":{
"$date":{
"type":"date",
"format":"dateOptionalTime"
}
}
},
"type":{
"type":"string",
"index":"not_analyzed"
}
}
}
}
}
}
@@ -1,13 +1,13 @@
{
"template" : "testing",
"template" : "testing-v2",
"order" : 1,
"settings" : {
"number_of_shards" : 1,
"number_of_replicas" : 0,
"index.refresh_interval" : "60s"
},
"mappings" : {
"testing" : {
"xdata_v2" : {
"properties" : {
"@timestamp" : {
"type" : "date",

0 comments on commit 28d1135

Please sign in to comment.