Skip to content

Commit

Permalink
feat: delete s3 support (#828)
Browse files Browse the repository at this point in the history
* feat: delete s3 support

* deps: bump versions
  • Loading branch information
hengfeiyang committed Mar 27, 2023
1 parent 455fa27 commit 8278c69
Show file tree
Hide file tree
Showing 19 changed files with 35 additions and 821 deletions.
1 change: 0 additions & 1 deletion .env.sample
Expand Up @@ -2,7 +2,6 @@ ZINC_FIRST_ADMIN_USER=admin
ZINC_FIRST_ADMIN_PASSWORD=admin
ZINC_SERVER_MODE=cluster
ZINC_ICE_COMPRESSOR=zstd
ZINC_S3_BUCKET=zinc-dev-misc1
ZINC_ETCD_USERNAME=root
ZINC_ETCD_ENDPOINTS=localhost:2379
ZINC_ETCD_PASSWORD=iwapfOK1wv
Expand Down
8 changes: 4 additions & 4 deletions README.md
@@ -1,5 +1,5 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/zinclabs/zincsearch)](https://goreportcard.com/report/github.com/zinclabs/zincsearch)
[![Docs](https://img.shields.io/badge/Docs-Docs-green)](https://docs.zinc.dev/) [![codecov](https://codecov.io/github/zinclabs/zincsearch/branch/main/graph/badge.svg)](https://codecov.io/github/zinclabs/zincsearch)
[![Docs](https://img.shields.io/badge/Docs-Docs-green)](https://zincsearch-docs.zinc.dev/) [![codecov](https://codecov.io/github/zinclabs/zincsearch/branch/main/graph/badge.svg)](https://codecov.io/github/zinclabs/zincsearch)

❗Note: If your use case is of log search (app and security logs) instead of app search (implement search feature in your application or website) then you should check [zinclabs/zincobserve](https://github.com/zinclabs/zincobserve) project that is specifically built for observability use case.
# ZincSearch
Expand Down Expand Up @@ -38,7 +38,7 @@ Note: Do not store sensitive data on this server as its available to everyone on
4. Compatibility with Elasticsearch APIs for ingestion of data (single record and bulk API)
5. Out of the box authentication
6. Schema less - No need to define schema upfront and different documents in the same index can have different fields.
7. Index storage in disk (default), s3 or minio (deprecated)
7. Index storage in disk
8. aggregation support

# Documentation
Expand Down Expand Up @@ -68,7 +68,7 @@ Please create an issue if you would like something to be added to the roadmap.

## Quickstart

Check [Quickstart](https://docs.zinc.dev/quickstart/)
Check [Quickstart](https://zincsearch-docs.zinc.dev/quickstart/)


# Releases
Expand All @@ -89,7 +89,7 @@ ZincSearch has hundreds of production installations is in GA.
| ES API compatibility| Search and Ingestion | Ingestion (Open source) and Search( enterprise) only |
| GUI | Basic | Advanced for log search |
| Cost | Free (self hosting may cost money based on size)| Free (self hosted), Generous free tier in cloud 200 GB ingest / month free.|
| Get started | [Quick start](https://docs.zinc.dev/quickstart/) | [![Sign up](./screenshots/get-started-for-free.png)](https://observe.zinc.dev) |
| Get started | [Quick start](https://zincsearch-docs.zinc.dev/quickstart/) | [![Sign up](./screenshots/get-started-for-free.png)](https://observe.zinc.dev) |

# Community

Expand Down
2 changes: 1 addition & 1 deletion cmd/zincsearch/main.go
Expand Up @@ -40,7 +40,7 @@ import (

// @title Zinc Search engine API
// @version 1.0.0
// @description Zinc Search engine API documents https://docs.zincsearch.com
// @description Zinc Search engine API documents https://zincsearch-docs.zinc.dev
// @termsOfService http://swagger.io/terms/

// @license.name Apache 2.0
Expand Down
2 changes: 1 addition & 1 deletion docs/docs.go
Expand Up @@ -3761,7 +3761,7 @@ var SwaggerInfo = &swag.Spec{
BasePath: "/",
Schemes: []string{"http", "https"},
Title: "Zinc Search engine API",
Description: "Zinc Search engine API documents https://docs.zincsearch.com",
Description: "Zinc Search engine API documents https://zincsearch-docs.zinc.dev",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
}
Expand Down
2 changes: 1 addition & 1 deletion docs/swagger.json
Expand Up @@ -5,7 +5,7 @@
],
"swagger": "2.0",
"info": {
"description": "Zinc Search engine API documents https://docs.zincsearch.com",
"description": "Zinc Search engine API documents https://zincsearch-docs.zinc.dev",
"title": "Zinc Search engine API",
"termsOfService": "http://swagger.io/terms/",
"contact": {
Expand Down
2 changes: 1 addition & 1 deletion docs/swagger.yaml
Expand Up @@ -1085,7 +1085,7 @@ info:
contact:
name: Zinc Search
url: https://www.zincsearch.com
description: Zinc Search engine API documents https://docs.zincsearch.com
description: Zinc Search engine API documents https://zincsearch-docs.zinc.dev
license:
name: Apache 2.0
url: http://www.apache.org/licenses/LICENSE-2.0.html
Expand Down
36 changes: 6 additions & 30 deletions go.mod
Expand Up @@ -3,15 +3,11 @@ module github.com/zinclabs/zincsearch
go 1.18

require (
github.com/aws/aws-sdk-go-v2 v1.17.3
github.com/aws/aws-sdk-go-v2/config v1.18.10
github.com/aws/aws-sdk-go-v2/service/s3 v1.30.1
github.com/blugelabs/bluge v0.1.9
github.com/blugelabs/bluge_segment_api v0.2.0
github.com/blugelabs/ice v1.0.0
github.com/blugelabs/query_string v0.3.0
github.com/bwmarrin/snowflake v0.3.0
github.com/dgraph-io/badger/v3 v3.2103.4
github.com/dgraph-io/badger/v3 v3.2103.5
github.com/docker/go-units v0.5.0
github.com/getsentry/sentry-go v0.17.0
github.com/gin-contrib/cors v1.4.0
Expand All @@ -20,7 +16,6 @@ require (
github.com/go-ego/gse v0.70.2
github.com/goccy/go-json v0.9.11
github.com/joho/godotenv v1.4.0
github.com/minio/minio-go/v7 v7.0.43
github.com/prometheus/client_golang v1.14.0
github.com/pyroscope-io/client v0.6.0
github.com/robfig/cron/v3 v3.0.1
Expand All @@ -30,36 +25,21 @@ require (
github.com/stretchr/testify v1.8.1
github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
github.com/swaggo/gin-swagger v1.5.3
github.com/swaggo/swag v1.8.7
github.com/swaggo/swag v1.8.11
github.com/zinclabs/go-gin-prometheus v0.1.1
github.com/zinclabs/wal v1.2.4
go.etcd.io/bbolt v1.3.6
go.etcd.io/etcd/client/v3 v3.5.7
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/text v0.6.0
golang.org/x/text v0.7.0
)

require (
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/RoaringBitmap/roaring v0.9.4 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.13.10 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.21 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.18.2 // indirect
github.com/aws/smithy-go v1.13.5 // indirect
github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
Expand All @@ -68,6 +48,7 @@ require (
github.com/blevesearch/segment v0.9.0 // indirect
github.com/blevesearch/snowballstem v0.9.0 // indirect
github.com/blevesearch/vellum v1.0.7 // indirect
github.com/blugelabs/bluge_segment_api v0.2.0 // indirect
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
github.com/caio/go-tdigest v3.1.0+incompatible // indirect
github.com/cespare/xxhash v1.1.0 // indirect
Expand Down Expand Up @@ -97,15 +78,12 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/klauspost/cpuid/v2 v2.1.0 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mschoch/smat v0.2.0 // indirect
Expand All @@ -117,7 +95,6 @@ require (
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/pyroscope-io/godeltaprof v0.1.0 // indirect
github.com/rs/xid v1.4.0 // indirect
github.com/segmentio/backo-go v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/tidwall/tinylru v1.1.0 // indirect
Expand All @@ -132,13 +109,12 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/net v0.0.0-20221002022538-bcab6841153b // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
google.golang.org/grpc v1.41.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down

0 comments on commit 8278c69

Please sign in to comment.