opensource/graylog2-server
1
0
Fork 0
mirror of https://github.com/Graylog2/graylog2-server.git synced 2026-03-13 09:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update assorted occurrences of "Graylog2"

Browse Source
This commit is contained in:
Jochen Schalanda
2016-01-07 10:28:13 +01:00
parent 27bf35e0f5
commit b76c8fc06e
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
graylog2-server/rest_docs/readme.md
View File

@@ -1 +1 @@
## graylog2-server REST documentation
## Graylog REST API documentation

2
graylog2-server/src/main/java/org/graylog2/metrics/LibratoMetricsFormatter.java
View File

@@ -47,7 +47,7 @@ public class LibratoMetricsFormatter extends MetricsFormatter {
//this.counter = counter;
this.streamFilter = streamFilter;
this.hostFilter = hostFilter;
this.source = prefix + "graylog2-server";
this.source = prefix + "graylog-server";
this.streamNames = streamNames;
}

2
graylog2-server/src/main/java/org/graylog2/shared/initializers/PeriodicalsService.java
View File

@@ -61,7 +61,7 @@ public class PeriodicalsService extends AbstractIdleService {
periodical.initialize();
if (periodical.masterOnly() && !serverStatus.hasCapability(ServerStatus.Capability.MASTER)) {
LOG.info("Not starting [{}] periodical. Only started on graylog2-server master nodes.", periodical.getClass().getCanonicalName());
LOG.info("Not starting [{}] periodical. Only started on Graylog master nodes.", periodical.getClass().getCanonicalName());
continue;
}

4
graylog2-server/src/main/java/org/graylog2/shared/rest/resources/system/LoadBalancerStatusResource.java
View File

@@ -58,7 +58,7 @@ public class LoadBalancerStatusResource extends RestResource {
@GET
@Timed
@Produces(MediaType.TEXT_PLAIN)
@ApiOperation(value = "Get status of this graylog2-server node for load balancers. " +
@ApiOperation(value = "Get status of this Graylog server node for load balancers. " +
"Returns either ALIVE with HTTP 200 or DEAD with HTTP 503.")
public Response status() {
final LoadBalancerStatus lbStatus = serverStatus.getLifecycle().getLoadbalancerStatus();
@@ -76,7 +76,7 @@ public class LoadBalancerStatusResource extends RestResource {
@RequiresAuthentication
@RequiresPermissions(RestPermissions.LBSTATUS_CHANGE)
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "Override load balancer status of this graylog2-server node. Next lifecycle " +
@ApiOperation(value = "Override load balancer status of this Graylog server node. Next lifecycle " +
"change will override it again to its default. Set to ALIVE or DEAD.")
@Path("/override/{status}")
public void override(@ApiParam(name = "status") @PathParam("status") String status) {

2
graylog2-server/src/main/resources/swagger/lib/swagger.js
View File

@@ -945,7 +945,7 @@
this.type = this.type.toUpperCase();
if(this.type != "GET") {
if(!confirm("Really execute this non-GET operation? It will be executed on the graylog2-server node.")){
if(!confirm("Really execute this non-GET operation? It will be executed on the Graylog server node.")){
$(".response_throbber").hide();
return;
}

16
graylog2-web-interface/src/logic/notifications/NotificationsFactory.js
View File

@@ -10,11 +10,11 @@ class NotificationsFactory {
switch(notification.type) {
case 'check_server_clocks':
return {
title: 'Check the system clocks of your graylog2-server nodes.',
title: 'Check the system clocks of your Graylog server nodes.',
description: (
<span>
A graylog2-server node detected a condition where it was deemed to be inactive immediately after being active.
This usually indicates either a significant jump in system time, e.g. via NTP, or that a second graylog2-server node
A Graylog server node detected a condition where it was deemed to be inactive immediately after being active.
This usually indicates either a significant jump in system time, e.g. via NTP, or that a second Graylog server node
is active on a system that has a different system time. Please make sure that the clocks of graylog2 systems are synchronized.
</span>
),
@@ -152,10 +152,10 @@ class NotificationsFactory {
};
case 'multi_master':
return {
title: 'Multiple graylog2-server masters in the cluster',
title: 'Multiple Graylog server masters in the cluster',
description: (
<span>
There were multiple graylog2-server instances configured as master in your Graylog cluster. The cluster handles
There were multiple Graylog server instances configured as master in your Graylog cluster. The cluster handles
this automatically by launching new nodes as slaves if there already is a master but you should still fix this.
Check the graylog.conf of every node and make sure that only one instance has is_master set to true. Close this
notification if you think you resolved the problem. It will pop back up if you start a second master node again.
@@ -175,11 +175,11 @@ class NotificationsFactory {
};
case 'no_master':
return {
title: 'There was no master graylog2-server node detected in the cluster.',
title: 'There was no master Graylog server node detected in the cluster.',
description: (
<span>
Certain operations of graylog2-server require the presence of a master node, but no such master was started.
Please ensure that one of your graylog2-server nodes contains the setting <code>is_master = true</code> in its
Certain operations of Graylog server require the presence of a master node, but no such master was started.
Please ensure that one of your Graylog server nodes contains the setting <code>is_master = true</code> in its
configuration and that it is running. Until this is resolved index cycling will not be able to run, which
means that the index retention mechanism is also not running, leading to increased index sizes. Certain
maintenance functions as well as a variety of web interface pages (e.g. Dashboards) are unavailable.

6
misc/elasticsearch.yml
View File

@@ -1,8 +1,8 @@
# this must be the same as for your elasticsearch cluster
cluster.name: graylog2
cluster.name: graylog
# you could also leave this out, but makes it easier to identify the graylog2 client instance
node.name: "graylog2-server"
# you could also leave this out, but makes it easier to identify the Graylog embedded Elasticsearch node
node.name: "graylog-server"
# we don't want the graylog2 client to store any data, or be master node
node.master: false

4
misc/graylog2.drl → misc/graylog.drl
View File

@@ -7,7 +7,7 @@
rule "Rewrite localhost host"
when
m : Message( source == "localhost" )
then
then
m.addField("source", "localhost.example.com" );
log.info( "[Overwrite localhost rule fired] : " + m.toString() );
end
@@ -18,4 +18,4 @@ rule "Drop UDP and ICMP Traffic from firewall"
then
m.setFilterOut(true);
log.info("[Drop all syslog ICMP and UDP traffic] : " + m.toString() );
end
end