RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the date returned by snapshot script friendly 

Fixes #3568

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
This commit is contained in:
Goutham Veeramachaneni 2017-12-10 13:19:34 -06:00
parent 838fc5a4d1
commit bee6864c14
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/querying/api.md
View File

@ -400,12 +400,12 @@ $ curl -XPOST http://localhost:9090/api/v1/admin/tsdb/snapshot
{ {
"status": "success", "status": "success",
"data": { "data": {
"name": "2017-11-30T15:31:59Z-2366f0a55106d6e1" "name": "20171210T211224Z-2be650b6d019eb54"
} }
} }
``` ```
The snapshot now exists at `<data-dir>/snapshots/2017-11-30T15:31:59Z-2366f0a55106d6e1` The snapshot now exists at `<data-dir>/snapshots/20171210T211224Z-2be650b6d019eb54`
*New in v2.1* *New in v2.1*

6
web/api/v1/api.go
View File

@ -638,8 +638,10 @@ func (api *API) snapshot(r *http.Request) (interface{}, *apiError) {
var ( var (
snapdir = filepath.Join(db.Dir(), "snapshots") snapdir = filepath.Join(db.Dir(), "snapshots")
name = fmt.Sprintf("%s-%x", time.Now().UTC().Format(time.RFC3339), rand.Int()) name = fmt.Sprintf("%s-%x",
dir = filepath.Join(snapdir, name) time.Now().UTC().Format("20060102T150405Z0700"),
rand.Int())
dir = filepath.Join(snapdir, name)
) )
if err := os.MkdirAll(dir, 0777); err != nil { if err := os.MkdirAll(dir, 0777); err != nil {
return nil, &apiError{errorInternal, fmt.Errorf("create snapshot directory: %s", err)} return nil, &apiError{errorInternal, fmt.Errorf("create snapshot directory: %s", err)}

6
web/api/v2/api.go
View File

@ -174,8 +174,10 @@ func (s *Admin) TSDBSnapshot(_ old_ctx.Context, _ *pb.TSDBSnapshotRequest) (*pb.
} }
var ( var (
snapdir = filepath.Join(db.Dir(), "snapshots") snapdir = filepath.Join(db.Dir(), "snapshots")
name = fmt.Sprintf("%s-%x", time.Now().UTC().Format(time.RFC3339), rand.Int()) name = fmt.Sprintf("%s-%x",
dir = filepath.Join(snapdir, name) time.Now().UTC().Format("20060102T150405Z0700"),
rand.Int())
dir = filepath.Join(snapdir, name)
) )
if err := os.MkdirAll(dir, 0777); err != nil { if err := os.MkdirAll(dir, 0777); err != nil {
return nil, status.Errorf(codes.Internal, "created snapshot directory: %s", err) return nil, status.Errorf(codes.Internal, "created snapshot directory: %s", err)