Skip to content

Commit

Permalink
Renames for moving on github.
Browse files Browse the repository at this point in the history
  • Loading branch information
phillbaker committed Sep 11, 2017
1 parent b1c113e commit 1143405
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 49 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Expand Up @@ -7,12 +7,12 @@ RUN go get -v github.com/Masterminds/glide \
&& go install \
&& cd -

COPY . $GOPATH/src/github.com/phillbaker/cloudwatchmetricbeat
RUN cd $GOPATH/src/github.com/phillbaker/cloudwatchmetricbeat && make collect && make
COPY . $GOPATH/src/github.com/narmitech/cloudwatchmetricbeat
RUN cd $GOPATH/src/github.com/narmitech/cloudwatchmetricbeat && make collect && make

RUN mkdir -p /etc/cloudwatchmetricbeat/ \
&& cp $GOPATH/src/github.com/phillbaker/cloudwatchmetricbeat/cloudwatchmetricbeat /usr/local/bin/cloudwatchmetricbeat \
&& cp $GOPATH/src/github.com/phillbaker/cloudwatchmetricbeat/_meta/beat.yml /etc/cloudwatchmetricbeat/cloudwatchmetricbeat.yml
&& cp $GOPATH/src/github.com/narmitech/cloudwatchmetricbeat/cloudwatchmetricbeat /usr/local/bin/cloudwatchmetricbeat \
&& cp $GOPATH/src/github.com/narmitech/cloudwatchmetricbeat/_meta/beat.yml /etc/cloudwatchmetricbeat/cloudwatchmetricbeat.yml

WORKDIR /etc/cloudwatchmetricbeat
ENTRYPOINT cloudwatchmetricbeat
2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
BEAT_NAME=cloudwatchmetricbeat
BEAT_PATH=github.com/phillbaker/cloudwatchmetricbeat
BEAT_PATH=github.com/narmitech/cloudwatchmetricbeat
BEAT_GOPATH=$(firstword $(subst :, ,${GOPATH}))
BEAT_URL=https://${BEAT_PATH}
SYSTEM_TESTS=false
Expand Down
24 changes: 11 additions & 13 deletions README.md
@@ -1,9 +1,9 @@
# Cloudwatchmetricbeat

Welcome to Cloudwatchmetricbeat.
Welcome to Cloudwatchmetricbeat. Based on previous work on [Cloudwatch Logs](https://github.com/e-travel/cloudwatchlogsbeat) and [Metrics](https://github.com/Technofy/cloudwatch_exporter)

Ensure that this folder is at the following location: `${GOPATH}/github.com/narmitech/cloudwatchmetricbeat`.

Ensure that this folder is at the following location:
`${GOPATH}/github.com/phillbaker/cloudwatchmetricbeat`

## Credentials and permissions

Expand All @@ -20,7 +20,7 @@ The `cloudwatch:ListMetrics` and `cloudwatch:GetMetricStatistics` IAM permission
The configuration is in YAML, an example with common options:
```
---
region: us-east-1
aws_region: us-east-1
metrics:
- aws_namespace: AWS/ELB
aws_metric_name: RequestCount
Expand All @@ -32,15 +32,13 @@ metrics:

Name | Description
---------|------------
region | Required. The AWS region to connect to.
role_arn | Optional. The AWS role to assume. Useful for retrieving cross account metrics.
aws_region | Required. The AWS region to connect to.
metrics | Required. A list of CloudWatch metrics to retrieve and export
aws_namespace | Required. Namespace of the CloudWatch metric.
aws_metric_name | Required. Metric name of the CloudWatch metric.
aws_dimensions | Optional. Which dimension to fan out over.
aws_dimension_select | Optional. Which dimension values to filter. Specify a map from the dimension name to a list of values to select from that dimension.
aws_dimension_select_regex | Optional. Which dimension values to filter on with a regular expression. Specify a map from the dimension name to a list of regexes that will be applied to select from that dimension.
aws_statistics | Optional. A list of statistics to retrieve, values can include Sum, SampleCount, Minimum, Maximum, Average. Defaults to all statistics unless extended statistics are requested.
aws_statistics | Optional. A list of statistics to retrieve, values can include Sum, SampleCount, Minimum, Maximum, Average. Defaults to Average.
delay_seconds | Optional. The newest data to request. Used to avoid collecting data that has not fully converged. Defaults to 300s.
range_seconds | Optional. How far back to request data for. Useful for cases such as Billing metrics that are only set every few hours. Defaults to 600s.
period_seconds | Optional. [Period](http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#CloudWatchPeriods) to request the metric for. Only the most recent data point is used. Defaults to 60s. Can be set globally and per metric.
Expand Down Expand Up @@ -93,7 +91,7 @@ It will create a clean git history for each major step. Note that you can always
To push Cloudwatchmetricbeat in the git repository, run the following commands:

```
git remote set-url origin https://github.com/phillbaker/cloudwatchmetricbeat
git remote set-url origin https://github.com/narmitech/cloudwatchmetricbeat
git push origin master
```

Expand Down Expand Up @@ -166,9 +164,9 @@ make clean
To clone Cloudwatchmetricbeat from the git repository, run the following commands:

```
mkdir -p ${GOPATH}/github.com/phillbaker/cloudwatchmetricbeat
cd ${GOPATH}/github.com/phillbaker/cloudwatchmetricbeat
git clone https://github.com/phillbaker/cloudwatchmetricbeat
mkdir -p ${GOPATH}/github.com/narmitech/cloudwatchmetricbeat
cd ${GOPATH}/github.com/narmitech/cloudwatchmetricbeat
git clone https://github.com/narmitech/cloudwatchmetricbeat
```


Expand All @@ -183,4 +181,4 @@ The beat frameworks provides tools to crosscompile and package your beat for dif
make package
```

This will fetch and create all images required for the build process. The hole process to finish can take several minutes.
This will fetch and create all images required for the build process. The whole process to finish can take several minutes.
28 changes: 0 additions & 28 deletions _meta/beat.yml
Expand Up @@ -9,39 +9,11 @@ cloudwatchmetricbeat:
# How often to query the api for metrics (default: 60s)
period: 60

# # the bucket in which log streams save their state
# s3_bucket_name: the-bucket-name
# # Defines how often the manager will refresh its list of monitored log groups
# # AWS API call: DescribeLogGroups
# group_refresh_frequency: 10s
# # defines how often a log group will refresh its list of monitored streams
# # AWS API call: DescribeLogStreams
# stream_refresh_frequency: 5s
# # defines how often groups, streams and the group manager log their reporting metrics
# report_frequency: 5m
# # defines AWS region (default: us-east-1)
aws_region: us-east-1

# # === HOT STREAMS ===
# # hot streams are streams whose last event is earlier than this value
# # a value of zero deactivates hot streams
# hot_stream_event_horizon: 5m
# # defines the refresh frequency of log events for hot streams
# # AWS API call: GetLogEvents
# hot_stream_event_refresh_frequency: 1s

# # === STANDARD STREAMS ===
# # log events earlier than this value are not captured
# # log streams whose last event is earlier than this value are not monitored
# stream_event_horizon: 3h
# # defines the refresh frequency of log events for streams
# # AWS API call: GetLogEvents
# stream_event_refresh_frequency: 10s

# === PROSPECTORS ===
# Applications whose log groups we'd like to monitor
prospectors:
# the id will be used as the _type field
- id: billing
default_region: us-east-1
metrics:
Expand Down
2 changes: 1 addition & 1 deletion beater/cloudwatchmetricbeat.go
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/aws/aws-sdk-go/service/cloudwatch"
"github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface"

"github.com/phillbaker/cloudwatchmetricbeat/config"
"github.com/narmitech/cloudwatchmetricbeat/config"
)

type Cloudwatchmetricbeat struct {
Expand Down
7 changes: 6 additions & 1 deletion glide.yaml
@@ -1,4 +1,4 @@
package: github.com/phillbaker/cloudwatchmetricbeat
package: github.com/narmitech/cloudwatchmetricbeat
import:
- package: github.com/elastic/beats
version: "5.3"
Expand All @@ -13,6 +13,11 @@ import:
- aws
- aws/session
- service/cloudwatch
- aws/client/metadata
- aws/credentials
- aws/defaults
- aws/request
- aws/signer/v4
- package: github.com/stretchr/testify
version: ^1.1.4
subpackages:
Expand Down
2 changes: 1 addition & 1 deletion main.go
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/elastic/beats/libbeat/beat"

"github.com/phillbaker/cloudwatchmetricbeat/beater"
"github.com/narmitech/cloudwatchmetricbeat/beater"
)

func main() {
Expand Down

0 comments on commit 1143405

Please sign in to comment.