Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.11.0 #62

Merged
merged 35 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8a74c3d
Revise README
PKing70 Apr 11, 2019
9d0d094
Merge pull request #27 from PKing70/patch-1
May 10, 2019
2064411
update CI password
May 14, 2019
06a624a
Bump handlebars from 4.0.12 to 4.5.3
dependabot[bot] Dec 27, 2019
9f946d7
Merge pull request #36 from splunk/dependabot/npm_and_yarn/handlebars…
Jan 2, 2020
b132814
Update CONTRIBUTING.md
PKing70 Mar 24, 2020
376f1ec
Dependency upgrades with Project updated to use Make with Splunk dock…
ashah-splunk Jun 9, 2021
188c835
Merge pull request #57 from splunk/DVPL-9451
ashah-splunk Jun 16, 2021
48bda96
Configuring GitHub Actions
ashah-splunk Jun 21, 2021
e969375
Update test.yml
ashah-splunk Jun 21, 2021
c9669ed
Update test.yml
ashah-splunk Jun 21, 2021
2d0a59c
Update test.yml
ashah-splunk Jun 21, 2021
c79d3d8
Update test.yml
ashah-splunk Jun 21, 2021
5634638
Update test.yml
ashah-splunk Jun 21, 2021
5db000c
Update test.yml
ashah-splunk Jun 21, 2021
8d26be2
Update test.yml
ashah-splunk Jun 21, 2021
6b27089
Port mapping
ashah-splunk Jun 21, 2021
5736220
Update test.yml
ashah-splunk Jun 21, 2021
3600c56
Update test.yml
ashah-splunk Jun 21, 2021
a1e160b
revert test.yml
ashah-splunk Jun 21, 2021
1fc1684
Update test.yml
ashah-splunk Jun 21, 2021
17fabb6
Update test.yml
ashah-splunk Jun 22, 2021
da09227
Revert docker compose
ashah-splunk Jun 23, 2021
bbe057d
Update test_send.js
ashah-splunk Jun 23, 2021
4fbd774
Configured release to NPM
akaila-splunk Jun 29, 2021
cebdda9
Merge pull request #59 from splunk/DVPL-9453
fantavlik Jun 29, 2021
ae0837a
Updated release type to published
akaila-splunk Jun 30, 2021
63c539d
Merge pull request #60 from splunk/DVPL-9454
ashah-splunk Jul 1, 2021
478a4e8
Merge pull request #38 from splunk/pking-dvpl-7677
fantavlik Jul 16, 2021
0d356d0
CREDITS.md file addition
ashah-splunk Jul 19, 2021
4378a52
Update CREDITS.md
ashah-splunk Jul 19, 2021
57591fb
Updating test.yml to inclue Node 10.0 version in the matrix
ashah-splunk Jul 22, 2021
26043a1
Merge pull request #61 from splunk/DVPL-9727
ashah-splunk Jul 23, 2021
4d53b75
Update version and docs
akaila-splunk Jul 23, 2021
769469f
Update CHANGELOG.md file
akaila-splunk Jul 27, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Create Release
Copy link
Contributor

@fantavlik fantavlik Jul 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Let's add an item to the CHANGELOG.md for this - under Minor changes: Converted CI from Travis to Github Actions and added CD

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated CHANGELOG.md file as suggested.

on:
release:
types: [published]
jobs:
build:
name: Create Release
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v1
with:
node-version: '14.0'
registry-url: 'https://registry.npmjs.org'
- run: npm install
# Publish to npm
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
37 changes: 37 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
[push, pull_request]

jobs:
test-execution:
runs-on: ubuntu-latest
strategy:
matrix:
node-version:
- "14.0"
- "10.0"
splunk-version:
- latest
- "8.0"
services:
splunk:
image: splunk/splunk:${{matrix.splunk-version}}
env:
SPLUNK_START_ARGS: --accept-license
SPLUNK_PASSWORD: changed!
ports:
- 8088:8088
- 8089:8089
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- name: Test Execution
run: npm test
1 change: 1 addition & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"es5" : false, // Allow EcmaScript 5 syntax.
"strict" : false, // Require `use strict` pragma in every file.
"globalstrict" : false, // Allow global "use strict" (also enables 'strict').
"esversion" : 6,


// The Good Parts.
Expand Down
39 changes: 0 additions & 39 deletions .travis.yml

This file was deleted.

14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Splunk logging for JavaScript

## v0.11.0

### New features & APIs

* Replaced client implementation to use `needle` in lieu of deprecated `request`
* Replaced client implementation to use `nyc` in lieu of deprecated `istanbul`

### Minor changes

* Converted CI from Travis to Github Actions and added CD
* Upgrade version of jsdoc to 3.6.7.
* Upgrade version of jshint to 2.12.0.
* Upgrade version of mocha to 8.4.0.

## v0.10.1

### Minor changes
Expand Down
29 changes: 13 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@

## How to contribute

If you would like to contribute to this project, go here for more information:

* [Splunk and open source][contributions]
* [Individual contributions][indivcontrib]
* [Company contributions][companycontrib]
If you would like to contribute to this project, see [Contributions to Splunk][indivcontrib] for more information.

## Issues & Bug Reports

If you're seeing some unexpected behavior with this project, please create an [issue on GitHub][issues] with the following information:

0. Version of this project you're using (ex: 0.8.0)
0. Platform version (ex: Windows Server 2012)
0. Framework version (ex: Node.js 0.10.37)
0. Splunk version (ex: 6.3.0)
0. Other relevant information (ex: local/remote environment, Splunk network configuration)
1. Version of this project you're using (ex: 0.8.0)
1. Platform version (ex: Windows Server 2012)
1. Framework version (ex: Node.js 0.10.37)
1. Splunk version (ex: 6.3.0)
1. Other relevant information (ex: local/remote environment, Splunk network configuration)

Alternatively, if you have a Splunk question please ask on [Splunk Answers][answers]

Expand All @@ -26,14 +22,14 @@ We love to see pull requests!

To create a pull request:

0. Fill out the [Individual Contributor Agreement][indivcontrib].
0. Fork [the repository][repo].
0. Make changes to the **`develop`** branch, preferably with tests.
0. Create a [pull request][pulls] against the **`develop`** branch.
1. Fill out the [Individual Contributor Agreement][indivcontrib].
1. Fork [the repository][repo].
1. Make changes to the **`develop`** branch, preferably with tests.
1. Create a [pull request][pulls] against the **`develop`** branch.

## Contact us

You can reach Splunk support at [email protected]_ if you have Splunk related questions.
You can [contact support][contact] if you have Splunk related questions.

You can reach the Developer Platform team at [email protected]_.

Expand All @@ -43,4 +39,5 @@ You can reach the Developer Platform team at [email protected]_.
[answers]: http://answers.splunk.com/
[repo]: https://github.com/splunk/splunk-logging-javascript
[issues]: https://github.com/splunk/splunk-logging-javascript/issues
[pulls]: https://github.com/splunk/splunk-logging-javascript/pulls
[pulls]: https://github.com/splunk/splunk-logging-javascript/pulls
[contact]: https://www.splunk.com/en_us/support-and-services.html
7 changes: 7 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Third-party software credits

Some of the components included in the Splunk logging for JavaScript are licensed under free or open source licenses. We wish to thank the contributors to those projects.

| Contributor | Description | License |
|:----------- |:----------- |:------- |
| [needle](https://github.com/tomas/needle) | Node.js http client | [MIT](https://github.com/splunk/splunk-javascript-logging/blob/master/licenses/LICENSE-NEEDLE) |
47 changes: 47 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# text reset
NO_COLOR=\033[0m
# green
OK_COLOR=\033[32;01m
# red
ERROR_COLOR=\033[31;01m
# cyan
WARN_COLOR=\033[36;01m
# yellow
ATTN_COLOR=\033[33;01m

ROOT_DIR := $(shell git rev-parse --show-toplevel)

VERSION := `git describe --tags --dirty 2>/dev/null`
COMMITHASH := `git rev-parse --short HEAD 2>/dev/null`
DATE := `date "+%FT%T%z"`

.PHONY: all
all: init test

init:
@echo "$(ATTN_COLOR)==> init $(NO_COLOR)"

.PHONY: test
test:
@echo "$(ATTN_COLOR)==> test $(NO_COLOR)"
@npm test

.PHONY: test_specific
test_specific:
@echo "$(ATTN_COLOR)==> test_specific $(NO_COLOR)"
@sh ./scripts/test_specific.sh

.PHONY: up
up:
@echo "$(ATTN_COLOR)==> up $(NO_COLOR)"
@docker-compose up -d

.PHONY: wait_up
wait_up:
@echo "$(ATTN_COLOR)==> wait_up $(NO_COLOR)"
@for i in `seq 0 180`; do if docker exec -it splunk /sbin/checkstate.sh &> /dev/null; then break; fi; printf "\rWaiting for Splunk for %s seconds..." $$i; sleep 1; done

.PHONY: down
down:
@echo "$(ATTN_COLOR)==> down $(NO_COLOR)"
@docker-compose stop
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Splunk logging for JavaScript

#### Version 0.10.1
#### Version 0.11.0

This project provides a simple JavaScript interface for logging to HTTP Event Collector in Splunk Enterprise and Splunk Cloud.

## Requirements

* Node.js v4 or later.
* Splunk Enterprise 6.3.0 or later, or Splunk Cloud.
* Node.js v4 or later. Splunk logging for Javascript is tested with Node.js v10.0 and v14.0.
* Splunk Enterprise 6.3.0 or later, or Splunk Cloud. Splunk logging for Javascript is tested with Splunk Enterprise 8.0 and 8.2.0.
* An HTTP Event Collector token from your Splunk Enterprise server.

## Installation
Expand Down
18 changes: 18 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '3.8'

services:
splunk:
image: "splunk/splunk:latest"
container_name: splunk
environment:
- SPLUNK_START_ARGS=--accept-license
- SPLUNK_PASSWORD=changed!
ports:
- 8000:8000
- 8088:8088
- 8089:8089
healthcheck:
test: ['CMD', 'curl', '-f', 'https://localhost:8000']
interval: 5s
timeout: 5s
retries: 20
19 changes: 19 additions & 0 deletions licenses/LICENSE-NEEDLE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) Fork, Ltd.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
35 changes: 16 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading