CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docs: Clean up make docs on windows (#12796)

This commit is contained in:
Joshua Powers 2023-03-07 01:40:13 -07:00 committed by GitHub
parent 2b6d9f22ad
commit 5b27866b13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -3,4 +3,6 @@ README.md merge=union
go.sum merge=union go.sum merge=union
plugins/inputs/all/all.go merge=union plugins/inputs/all/all.go merge=union
plugins/outputs/all/all.go merge=union plugins/outputs/all/all.go merge=union
**/testdata/** test eol=lf
# Always check-out / check-in files with LF line endings.
* text=auto eol=lf

4
Makefile
View File

@ -115,9 +115,7 @@ build_tools:
$(HOSTGO) build -o ./tools/readme_linter/readme_linter$(EXEEXT) ./tools/readme_linter $(HOSTGO) build -o ./tools/readme_linter/readme_linter$(EXEEXT) ./tools/readme_linter
embed_readme_%: embed_readme_%:
GOOS=linux go generate -run="readme_config_includer/generator$$" ./plugins/$*/... go generate -run="readme_config_includer/generator$$" ./plugins/$*/...
GOOS=windows go generate -run="readme_config_includer/generator$$" ./plugins/$*/...
GOOS=darwin go generate -run="readme_config_includer/generator$$" ./plugins/$*/...
.PHONY: config .PHONY: config
config: config:

4
plugins/serializers/csv/csv_test.go
View File

@ -83,6 +83,8 @@ func TestSerializeTransformationNonBatch(t *testing.T) {
// Serialize // Serialize
serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix) serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix)
require.NoError(t, err) require.NoError(t, err)
// expected results use LF endings
serializer.writer.UseCRLF = false
var actual bytes.Buffer var actual bytes.Buffer
for _, m := range metrics { for _, m := range metrics {
buf, err := serializer.Serialize(m) buf, err := serializer.Serialize(m)
@ -149,6 +151,8 @@ func TestSerializeTransformationBatch(t *testing.T) {
// Serialize // Serialize
serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix) serializer, err := NewSerializer(cfg.TimestampFormat, cfg.Separator, cfg.Header, cfg.Prefix)
require.NoError(t, err) require.NoError(t, err)
// expected results use LF endings
serializer.writer.UseCRLF = false
actual, err := serializer.SerializeBatch(metrics) actual, err := serializer.SerializeBatch(metrics)
require.NoError(t, err) require.NoError(t, err)

3
tools/readme_config_includer/generator.go
View File

@ -54,7 +54,8 @@ func extractIncludeBlock(txt []byte, includesEx *regexp.Regexp, root string) *in
} }
include := filepath.FromSlash(string(inc[1])) include := filepath.FromSlash(string(inc[1]))
// Make absolute paths relative to the include-root if any // Make absolute paths relative to the include-root if any
if filepath.IsAbs(include) { // Check original value to avoid platform specific slashes
if filepath.IsAbs(string(inc[1])) {
if root == "" { if root == "" {
log.Printf("Ignoring absolute include %q without include root...", include) log.Printf("Ignoring absolute include %q without include root...", include)
continue continue