Skip to content

Commit a17a8b0

Browse files
committed
fix(influxdb): fix influxdb host and port
Signed-off-by: Cryptophobia <aouzounov@gmail.com>
1 parent 38fb9c8 commit a17a8b0

5 files changed

Lines changed: 23 additions & 14 deletions

File tree

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) Microsoft Corporation. All rights reserved.
3+
Copyright (c) Team Hephy. All rights reserved.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

rootfs/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ USER root
55
COPY fluentd /fluentd
66
COPY entrypoint.sh /bin/
77
RUN chmod +x /bin/entrypoint.sh
8+
ENV FLUENTD_CONF="/fluentd/etc/fluent.conf"
89

910
RUN apk add bash findutils \
1011
&& apk add --update --virtual .build-deps sudo build-base ruby-dev \

rootfs/fluentd/deis-output/LICENSE

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
Copyright Engine Yard, Inc.
1+
The MIT License (MIT)
22

3-
Licensed under the Apache License, Version 2.0 (the "License");
4-
you may not use this file except in compliance with the License.
5-
You may obtain a copy of the License at
3+
Copyright (c) Team Hephy. All rights reserved.
64

7-
http://www.apache.org/licenses/LICENSE-2.0
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
811

9-
Unless required by applicable law or agreed to in writing, software
10-
distributed under the License is distributed on an "AS IS" BASIS,
11-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
See the License for the specific language governing permissions and
13-
limitations under the License.
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

rootfs/fluentd/deis-output/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Deis Fluentd plugin
22
Deis (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
33

4-
For more information about the Deis Workflow, please visit the main project page at https://github.com/teamhephy/workflow.
4+
For more information about the Hephy Workflow, please visit the main project page at https://github.com/teamhephy/workflow.
55

66
## About
77
[Fluentd](http://www.fluentd.org/) is an integral part of the [Deis Workflow](https://github.com/teamhephy/workflow) stack. It is responsible for consuming all of the log data produced by the Kuberenetes cluster. This includes the kubernetes components, Workflow components, and user deployed applications. This plugin takes that log data and will forward it to the appropriate Workflow components.

rootfs/fluentd/deis-output/lib/fluent/mixin/deis.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module Fluent
77
module Mixin
88
module Deis
99
LOGGER_URL = "http://#{ENV['DEIS_LOGGER_SERVICE_HOST']}:#{ENV['DEIS_LOGGER_SERVICE_PORT_HTTP']}/logs"
10-
INFLUX_HOST = "#{ENV['DEIS_MONITOR_INFLUXAPI_SERVICE_HOST']}"
11-
INFLUX_PORT = "#{ENV['DEIS_MONITOR_INFLUXAPI_SERVICE_PORT_TRANSPORT']}"
10+
INFLUX_HOST = "#{ENV['DEIS_MONITOR_INFLUX_API_SERVICE_HOST']}"
11+
INFLUX_PORT = "#{ENV['DEIS_MONITOR_INFLUX_API_SERVICE_PORT_TRANSPORT']}"
1212
INFLUX_DATABASE = ENV['INFLUX_DATABASE'] || "kubernetes"
1313
NSQ_URL = "#{ENV['DEIS_NSQD_SERVICE_HOST']}:#{ENV['DEIS_NSQD_SERVICE_PORT_TRANSPORT']}"
1414

0 commit comments

Comments
 (0)